diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-08-25 09:20:17 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-08-26 11:00:56 -0400 |
| commit | 517f3390c14bc9bf570581a914fa64ac55c1ccd9 (patch) | |
| tree | 38a2fecf60f29150cda12cdc38f4df73e47afc1d /playbooks | |
| parent | 2e975430061785e1acf2189e57ee7bfaee1a9411 (diff) | |
| download | openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.gz openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.bz2 openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.tar.xz openshift-517f3390c14bc9bf570581a914fa64ac55c1ccd9.zip | |
Remove atomic check and cockpit.socket
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 6c5ece9bd..0b85b2485 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -26,4 +26,4 @@ openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_debug_level: "{{ debug_level | default(2) }}" openshift_deployment_type: "{{ deployment_type }}" - openshift_deployment_subtype: "{{ deployment_subtype }}" + openshift_deployment_subtype: "{{ deployment_subtype | default(none) }}" diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index ba6a4eace..26b31d313 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -15,6 +15,6 @@ when: openshift.common.use_manageiq | 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 ( deployment_subtype != 'registry' ) + (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' ) - role: flannel_register when: openshift.common.use_flannel | bool diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 7028ad438..f65b7a2cd 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -45,4 +45,4 @@ - role: openshift_metrics when: openshift.hosted.metrics.deploy | bool - role: cockpit-ui - when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' ) + when: ( openshift.common.deployment_subtype == 'registry' ) |