diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-21 15:53:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 15:53:30 -0500 |
| commit | fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4 (patch) | |
| tree | 54d9187a470cd044be9406e97d47ca5989411570 /playbooks/openshift-master | |
| parent | 0300b611877689e9f14ad5714b1e4e2c7224ca1e (diff) | |
| parent | e3cf9edff6d0186b09b1a112592f283fab6857d0 (diff) | |
| download | openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.gz openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.bz2 openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.xz openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.zip | |
Merge pull request #6530 from mgugino-upstream-stage/init-task-trim
Move sanity_checks into custom action plugin
Diffstat (limited to 'playbooks/openshift-master')
| -rw-r--r-- | playbooks/openshift-master/private/additional_config.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-master/private/config.yml | 2 |
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 |