diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-18 12:58:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-18 12:58:20 -0700 |
commit | e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704 (patch) | |
tree | 9485f38ac794add00295a3654825487cf24c8632 /roles | |
parent | 67191c2b9dea3ef7399773b96c7fc1d827498eac (diff) | |
parent | 2dc0fe2a75c2a09043ffac9c19a2c0e8bd0e38ed (diff) | |
download | openshift-e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704.tar.gz openshift-e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704.tar.bz2 openshift-e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704.tar.xz openshift-e067d79bdbbd7d94dbc2d86c7dd4a20ac787f704.zip |
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
Diffstat (limited to 'roles')
-rw-r--r-- | roles/openshift_sanitize_inventory/tasks/main.yml | 21 |
1 files changed, 21 insertions, 0 deletions
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. |