From 2e975430061785e1acf2189e57ee7bfaee1a9411 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 23 Aug 2016 16:24:46 -0400 Subject: Re-organize registry-console deployment. --- playbooks/common/openshift-cluster/additional_config.yml | 2 -- playbooks/common/openshift-cluster/openshift_hosted.yml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'playbooks') 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' ) -- cgit v1.2.3