upgrade: Verify osm_cluster_network_cidr and openshift_portal_net are…

… set

When upgrading both osm_cluster_network_cidr and openshift_portal_net
must be set to avoid SDN initialization errors. This was found when
the default parameters were changed between Openshift versions. This
meant users who upgraded and did not specify either mentioned variable
at install/upgrade time ended up getting SDN errors post upgrade.

When osm_cluster_network_cidr and openshift_portal_net are not set
the upgrade will fail telling the user that the variables must be set
and how to find the current values in the current install.

Reference: b50b4ea
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1451023

playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml

@@ -9,6 +9,19 @@
         deployment types
     when: deployment_type not in ['origin','openshift-enterprise', 'online']
 
+  # osm_cluster_network_cidr and openshift_portal_net are required when upgrading
+  # to avoid changes that may occur between releases
+  # Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1451023
+  - assert:
+    that:
+    - "osm_cluster_network_cidr is defined"
+    - "openshift_portal_net is defined"
+    msg: >
+      osm_cluster_network_cidr and openshift_portal_net are required inventory variables when upgrading.
+      These variables should match what is currently used in the cluster. If you don't remember what
+      these values are you can find them in /etc/origin/master/master-config.yaml on a master with the names
+      clusterNetworkCIDR(osm_cluster_network_cidr)  and hostSubnetLength (openshift_portal_net).
+
   # Error out in situations where the user has older versions specified in their
   # inventory in any of the openshift_release, openshift_image_tag, and
   # openshift_pkg_version variables. These must be removed or updated to proceed