diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-12 11:07:12 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-20 13:04:03 -0400 |
| commit | 4b8f66c37b865c7be59310854f5f9bd3de3e01bb (patch) | |
| tree | 0de1cd2d6b8710503e7f2a1dc6c8fa1271b46ca6 /playbooks/common/openshift-master | |
| parent | af580f808d78667bde54b88d4c33fca493828945 (diff) | |
| download | openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.gz openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.bz2 openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.xz openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.zip | |
Cleanup old deployment types
Previously, openshift-ansible supported various
types of deployments using the variable "openshift_deployment_type"
Currently, openshift-ansible only supports two deployment types,
"origin" and "openshift-enterprise".
This commit removes all logic and references to deprecated
deployment types.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/additional_config.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml index 7468c78f0..de467a722 100644 --- a/playbooks/common/openshift-master/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml @@ -17,7 +17,10 @@ - role: openshift_manageiq when: openshift_use_manageiq | default(false) | bool - role: cockpit - when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and - (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' ) + when: + - openshift.common.is_atomic + - deployment_type == 'openshift-enterprise' + - osm_use_cockpit is undefined or osm_use_cockpit | bool + - openshift.common.deployment_subtype != 'registry' - role: flannel_register when: openshift_use_flannel | default(false) | bool diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index e1b9a4964..3decbd973 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -35,7 +35,9 @@ file: path: "/etc/origin/{{ item }}" state: absent - when: rpmgenerated_config.stat.exists == true and deployment_type in ['openshift-enterprise', 'atomic-enterprise'] + when: + - rpmgenerated_config.stat.exists == true + - deployment_type == 'openshift-enterprise' with_items: - master - node |