summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-master/private
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-19 16:36:47 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-21 12:28:19 -0500
commite3cf9edff6d0186b09b1a112592f283fab6857d0 (patch)
treedf4d6cc470951890afbea563a12f98fecfe16419 /playbooks/openshift-master/private
parentedde00af6a5b811468fe2a0e9bff45346103be92 (diff)
downloadopenshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.gz
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.bz2
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.tar.xz
openshift-e3cf9edff6d0186b09b1a112592f283fab6857d0.zip
Remove references to deployment_type
Move openshift_deployment_type check into sanity_check action plugin. Remove compatibility for deployment_type. deployment_type has been deprecated for some time now.
Diffstat (limited to 'playbooks/openshift-master/private')
-rw-r--r--playbooks/openshift-master/private/additional_config.yml2
-rw-r--r--playbooks/openshift-master/private/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-master/private/additional_config.yml b/playbooks/openshift-master/private/additional_config.yml
index 81bb8cc5c..85be0e600 100644
--- a/playbooks/openshift-master/private/additional_config.yml
+++ b/playbooks/openshift-master/private/additional_config.yml
@@ -31,7 +31,7 @@
- role: cockpit
when:
- not openshift_is_atomic | bool
- - deployment_type == 'openshift-enterprise'
+ - openshift_deployment_type == 'openshift-enterprise'
- osm_use_cockpit is undefined or osm_use_cockpit | bool
- openshift.common.deployment_subtype != 'registry'
- role: flannel_register
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml
index 3093444b4..e53a6f093 100644
--- a/playbooks/openshift-master/private/config.yml
+++ b/playbooks/openshift-master/private/config.yml
@@ -47,7 +47,7 @@
state: absent
when:
- rpmgenerated_config.stat.exists == true
- - deployment_type == 'openshift-enterprise'
+ - openshift_deployment_type == 'openshift-enterprise'
with_items:
- master
- node