summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-20 16:33:28 -0400
committerGitHub <noreply@github.com>2017-10-20 16:33:28 -0400
commit8ef64935d20b35d96009435305b6e65f0af549cc (patch)
tree4cd580049cb0ef58d98e9a4d83c1834718743fbb
parentfa33e24acde96056e3bc6adf0f8f5cb174d12e81 (diff)
parent0fae6f6b128f4575b2546e32e704f11bb9409491 (diff)
downloadopenshift-8ef64935d20b35d96009435305b6e65f0af549cc.tar.gz
openshift-8ef64935d20b35d96009435305b6e65f0af549cc.tar.bz2
openshift-8ef64935d20b35d96009435305b6e65f0af549cc.tar.xz
openshift-8ef64935d20b35d96009435305b6e65f0af549cc.zip
Merge pull request #5752 from kwoodson/bz1491399
[bz1491399] Adding pre check to verify clusterid is set along with cloudprovider when performing upgrade.
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index e327ee9f5..74c1a51a8 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -54,3 +54,16 @@
- include: unsupported.yml
when:
- not openshift_enable_unsupported_configurations | default(false) | bool
+
+- name: Ensure clusterid is set along with the cloudprovider
+ fail:
+ msg: >
+ Ensure that the openshift_clusterid is set and that all infrastructure has the required tags.
+
+ For dynamic provisioning when using multiple clusters in different zones, tag each node with Key=kubernetes.io/cluster/xxxx,Value=clusterid where xxxx and clusterid are unique per cluster. In versions prior to 3.6, this was Key=KubernetesCluster,Value=clusterid.
+
+ https://github.com/openshift/openshift-docs/blob/master/install_config/persistent_storage/dynamically_provisioning_pvs.adoc#available-dynamically-provisioned-plug-ins
+ when:
+ - openshift_clusterid is not defined
+ - openshift_cloudprovider_kind is defined
+ - openshift_cloudprovider_kind == 'aws'