summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-15 12:11:43 -0400
committerSteve Milner <smilner@redhat.com>2017-09-15 12:51:36 -0400
commit554edfd1b9e26521967b5e2951d5065eb0578ff3 (patch)
treef301d6d4833297249d1610d2cfb0ad705604b282 /roles
parent87449eed97d4a4320a08706f071192853961535f (diff)
downloadopenshift-554edfd1b9e26521967b5e2951d5065eb0578ff3.tar.gz
openshift-554edfd1b9e26521967b5e2951d5065eb0578ff3.tar.bz2
openshift-554edfd1b9e26521967b5e2951d5065eb0578ff3.tar.xz
openshift-554edfd1b9e26521967b5e2951d5065eb0578ff3.zip
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 <smilner@redhat.com>
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml16
1 files changed, 16 insertions, 0 deletions
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.