From 554edfd1b9e26521967b5e2951d5065eb0578ff3 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 15 Sep 2017 12:11:43 -0400 Subject: openshift_sanitize_inventory: Check for required vars Moved the checks for osm_cluster_network_cidr, osm_host_subnet_length, openshift_portal_net from upgrade to openshift_sanitize_inventory as we now consider it a required variable for install, updrade, or scale up. Signed-off-by: Steve Milner --- roles/openshift_sanitize_inventory/tasks/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'roles/openshift_sanitize_inventory') diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml index 59ce505d3..89bfc011c 100644 --- a/roles/openshift_sanitize_inventory/tasks/main.yml +++ b/roles/openshift_sanitize_inventory/tasks/main.yml @@ -12,6 +12,22 @@ 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 +# 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. 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. -- cgit v1.2.3 From 03678b1032881e67bc221d2b26874621d69f0311 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 15 Sep 2017 14:23:56 -0400 Subject: testing: Skip net vars on integration tests Signed-off-by: Steve Milner --- roles/openshift_sanitize_inventory/tasks/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'roles/openshift_sanitize_inventory') diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml index 89bfc011c..47d7be05a 100644 --- a/roles/openshift_sanitize_inventory/tasks/main.yml +++ b/roles/openshift_sanitize_inventory/tasks/main.yml @@ -14,8 +14,13 @@ # 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 -- assert: +- when: + - not testing_skip_some_requirements|default(False)|bool + assert: that: - "osm_cluster_network_cidr is defined" - "osm_host_subnet_length is defined" -- cgit v1.2.3