summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-07-28 12:37:26 -0700
committerAndrew Butcher <abutcher@redhat.com>2016-07-29 13:27:58 -0700
commit7ab97920067af0500f1b8ed2eb840e663c4c80e3 (patch)
treee3525560b787f76388653f53888b31e0def413fa /playbooks/common/openshift-cluster
parentc70525677eed8818602d2a6db080e009689c0ca3 (diff)
downloadopenshift-7ab97920067af0500f1b8ed2eb840e663c4c80e3.tar.gz
openshift-7ab97920067af0500f1b8ed2eb840e663c4c80e3.tar.bz2
openshift-7ab97920067af0500f1b8ed2eb840e663c4c80e3.tar.xz
openshift-7ab97920067af0500f1b8ed2eb840e663c4c80e3.zip
Move role dependencies to playbooks.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml23
1 files changed, 23 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index c3077e3c2..4d4a09828 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -15,4 +15,27 @@
openshift_hosted_registry_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}"
when: "'master' in hostvars[groups.oo_first_master.0].openshift and 'registry_url' in hostvars[groups.oo_first_master.0].openshift.master"
roles:
+ - role: openshift_cli
+ - role: openshift_hosted_facts
+ - role: openshift_projects
+ # TODO: Move standard project definitions to openshift_hosted/vars/main.yml
+ # Vars are not accessible in meta/main.yml in ansible-1.9.x
+ openshift_projects: "{{ openshift_additional_projects | default({}) | oo_merge_dicts({'default':{'default_node_selector':''},'openshift-infra':{'default_node_selector':''},'logging':{'default_node_selector':''}}) }}"
+ - role: openshift_serviceaccounts
+ openshift_serviceaccounts_names:
+ - router
+ openshift_serviceaccounts_namespace: default
+ openshift_serviceaccounts_sccs:
+ - hostnetwork
+ when: openshift.common.version_gte_3_2_or_1_2
+ - role: openshift_serviceaccounts
+ openshift_serviceaccounts_names:
+ - router
+ - registry
+ openshift_serviceaccounts_namespace: default
+ openshift_serviceaccounts_sccs:
+ - privileged
+ when: not openshift.common.version_gte_3_2_or_1_2
+ - role: openshift_metrics
+ when: openshift.hosted.metrics.deploy | bool
- role: openshift_hosted