Merge pull request #5430 from ashcrow/always-required-new-variables

Automatic merge from submit-queue

Always required new variables

Related to https://bugzilla.redhat.com/show_bug.cgi?id=1451023

6 files changed, 45 insertions, 20 deletions

diff --git a/.papr.inventory b/.papr.inventory
index 878d434e2..aa4324c21 100644
--- a/.papr.inventory
+++ b/.papr.inventory
@@ -11,6 +11,9 @@ openshift_image_tag="{{ lookup('env', 'OPENSHIFT_IMAGE_TAG') }}"
 openshift_master_default_subdomain="{{ lookup('env', 'RHCI_ocp_node1_IP') }}.xip.io"
 openshift_check_min_host_disk_gb=1.5
 openshift_check_min_host_memory_gb=1.9
+osm_cluster_network_cidr=10.128.0.0/14
+openshift_portal_net=172.30.0.0/16
+osm_host_subnet_length=9
 
 [masters]
 ocp-master
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index be15944d5..486fe56a0 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -613,7 +613,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # WORKAROUND : If you must use an overlapping subnet, you can configure a non conflicting
 # docker0 CIDR range by adding '--bip=192.168.2.1/24' to DOCKER_NETWORK_OPTIONS
 # environment variable located in /etc/sysconfig/docker-network.
-# When upgrading these must be specificed!
+# When upgrading or scaling up the following must match whats in your master config!
+#  Inventory: master yaml field
+#  osm_cluster_network_cidr: clusterNetworkCIDR
+#  openshift_portal_net: serviceNetworkCIDR
+# When installing osm_cluster_network_cidr and openshift_portal_net must be set.
+# Sane examples are provided below.
 #osm_cluster_network_cidr=10.128.0.0/14
 #openshift_portal_net=172.30.0.0/16
 
@@ -635,7 +640,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 
 # Configure number of bits to allocate to each host’s subnet e.g. 9
 # would mean a /23 network on the host.
-# When upgrading this must be specificed!
+# When upgrading or scaling up the following must match whats in your master config!
+#  Inventory: master yaml field
+#  osm_host_subnet_length:  hostSubnetLength
+# When installing osm_host_subnet_length must be set. A sane example is provided below.
 #osm_host_subnet_length=9
 
 # Configure master API and console ports.
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index ad84e6aef..92a0927e5 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -621,7 +621,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # WORKAROUND : If you must use an overlapping subnet, you can configure a non conflicting
 # docker0 CIDR range by adding '--bip=192.168.2.1/24' to DOCKER_NETWORK_OPTIONS
 # environment variable located in /etc/sysconfig/docker-network.
-# When upgrading these must be specificed!
+# When upgrading or scaling up the following must match whats in your master config!
+#  Inventory: master yaml field
+#  osm_cluster_network_cidr: clusterNetworkCIDR
+#  openshift_portal_net: serviceNetworkCIDR
+# When installing osm_cluster_network_cidr and openshift_portal_net must be set.
+# Sane examples are provided below.
 #osm_cluster_network_cidr=10.128.0.0/14
 #openshift_portal_net=172.30.0.0/16
 
@@ -643,7 +648,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 
 # Configure number of bits to allocate to each host’s subnet e.g. 9
 # would mean a /23 network on the host.
-# When upgrading this must be specificed!
+# When upgrading or scaling up the following must match whats in your master config!
+#  Inventory: master yaml field
+#  osm_host_subnet_length:  hostSubnetLength
+# When installing osm_host_subnet_length must be set. A sane example is provided below.
 #osm_host_subnet_length=9
 
 # Configure master API and console ports.
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml
index 4c345dbe8..9a959a959 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml
@@ -9,21 +9,6 @@
         deployment types
     when: deployment_type not in ['origin','openshift-enterprise', 'online']
 
-  # osm_cluster_network_cidr, osm_host_subnet_length 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"
-      - "osm_host_subnet_length is defined"
-      - "openshift_portal_net is defined"
-      msg: >
-        osm_cluster_network_cidr, osm_host_subnet_length, 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),
-        hostSubnetLength (osm_host_subnet_length), and serviceNetworkCIDR (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
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index 59ce505d3..47d7be05a 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -12,6 +12,27 @@
       deployment_type is deprecated in favor of openshift_deployment_type.
       Please specify only openshift_deployment_type, or make both the same.
 
+# osm_cluster_network_cidr, osm_host_subnet_length and openshift_portal_net are
+# now required to avoid changes that may occur between releases
+#
+# Note: We will skip these checks when some tests run which don't
+# actually do any insalling/upgrading/scaling/etc..
+# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1451023
+- when:
+    - not testing_skip_some_requirements|default(False)|bool
+  assert:
+    that:
+      - "osm_cluster_network_cidr is defined"
+      - "osm_host_subnet_length is defined"
+      - "openshift_portal_net is defined"
+    msg: >
+      osm_cluster_network_cidr, osm_host_subnet_length, and openshift_portal_net are required inventory
+      variables. If you are upgrading or scaling up 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), hostSubnetLength (osm_host_subnet_length),
+      and serviceNetworkCIDR (openshift_portal_net).
+
 - name: Standardize on latest variable names
   set_fact:
     # goal is to deprecate deployment_type in favor of openshift_deployment_type.
diff --git a/test/integration/openshift_health_checker/common.go b/test/integration/openshift_health_checker/common.go
index a92d6861d..8b79c48cb 100644
--- a/test/integration/openshift_health_checker/common.go
+++ b/test/integration/openshift_health_checker/common.go
@@ -25,7 +25,7 @@ func (p PlaybookTest) Run(t *testing.T) {
 	// A PlaybookTest is intended to be run in parallel with other tests.
 	t.Parallel()
 
-	cmd := exec.Command("ansible-playbook", "-i", "/dev/null", p.Path)
+	cmd := exec.Command("ansible-playbook", "-e", "testing_skip_some_requirements=1", "-i", "/dev/null", p.Path)
 	cmd.Env = append(os.Environ(), "ANSIBLE_FORCE_COLOR=1")
 	b, err := cmd.CombinedOutput()