summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-08-23 16:24:46 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-26 10:57:46 -0400
commit2e975430061785e1acf2189e57ee7bfaee1a9411 (patch)
treeef99c1ecc1134dd67c7ad77efc24b20a802c75d1 /playbooks/common
parente18c05bbeae08738eae78e246c26c9d513c5fcf2 (diff)
downloadopenshift-2e975430061785e1acf2189e57ee7bfaee1a9411.tar.gz
openshift-2e975430061785e1acf2189e57ee7bfaee1a9411.tar.bz2
openshift-2e975430061785e1acf2189e57ee7bfaee1a9411.tar.xz
openshift-2e975430061785e1acf2189e57ee7bfaee1a9411.zip
Re-organize registry-console deployment.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml2
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml3
2 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index c3b1a9365..ba6a4eace 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/playbooks/common/openshift-cluster/additional_config.yml
@@ -16,7 +16,5 @@
- 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' )
- - role: cockpit-ui
- when: not openshift.common.is_atomic and ( 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 c90c85cbd..7028ad438 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -1,3 +1,4 @@
+---
- name: Create persistent volumes
hosts: oo_first_master
tags:
@@ -43,3 +44,5 @@
- role: openshift_hosted
- role: openshift_metrics
when: openshift.hosted.metrics.deploy | bool
+ - role: cockpit-ui
+ when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' )