summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-26 11:48:29 -0400
committerGitHub <noreply@github.com>2016-08-26 11:48:29 -0400
commit739648d2131a2723a21eafa4217203025438e729 (patch)
tree38a2fecf60f29150cda12cdc38f4df73e47afc1d /playbooks/common
parent577195e3eefe19b95e39f0f52834cd3dc8f77cdf (diff)
parent517f3390c14bc9bf570581a914fa64ac55c1ccd9 (diff)
downloadopenshift-739648d2131a2723a21eafa4217203025438e729.tar.gz
openshift-739648d2131a2723a21eafa4217203025438e729.tar.bz2
openshift-739648d2131a2723a21eafa4217203025438e729.tar.xz
openshift-739648d2131a2723a21eafa4217203025438e729.zip
Merge pull request #2235 from smunilla/atomic-registry
a-o-i: Add support for Atomic Registry Installs
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, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index ebbd45a67..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 )
+ (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 c90c85cbd..f65b7a2cd 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: ( openshift.common.deployment_subtype == 'registry' )