diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-21 09:57:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 09:57:12 -0400 |
| commit | fd9ff637477df20a399632f2360362bc3a0b4be2 (patch) | |
| tree | 918339949ed121df90e57e87054e6e09d543ed8a /roles/openshift_sanitize_inventory | |
| parent | b9941e458dfa09b5e62bf00e193aceb8d175c03a (diff) | |
| parent | 4a79cbe618652748974a4abd4c19c6a3dc800b2b (diff) | |
| download | openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.gz openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.bz2 openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.xz openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.zip | |
Merge pull request #5473 from abutcher/scaleup-network-values
Set network facts using first master's config during scaleup.
Diffstat (limited to 'roles/openshift_sanitize_inventory')
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/main.yml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml index 47d7be05a..59ce505d3 100644 --- a/roles/openshift_sanitize_inventory/tasks/main.yml +++ b/roles/openshift_sanitize_inventory/tasks/main.yml @@ -12,27 +12,6 @@ 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. |