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 /playbooks/common | |
| 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 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml | 15 |
1 files changed, 0 insertions, 15 deletions
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 |