summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-01-09 15:22:06 -0500
committerAndrew Butcher <abutcher@redhat.com>2017-01-09 15:22:06 -0500
commitd113f03968476c4bf899e20317bfa644ee539560 (patch)
tree8ad5a369054efec56b6b34ad5f7962b0dae9d04c /roles/openshift_hosted
parentafa745c53379408955b87db91b9b29d51fabf37b (diff)
downloadopenshift-d113f03968476c4bf899e20317bfa644ee539560.tar.gz
openshift-d113f03968476c4bf899e20317bfa644ee539560.tar.bz2
openshift-d113f03968476c4bf899e20317bfa644ee539560.tar.xz
openshift-d113f03968476c4bf899e20317bfa644ee539560.zip
Move role dependencies out of playbooks for openshift_master, openshift_node and openshift_hosted.
Diffstat (limited to 'roles/openshift_hosted')
-rw-r--r--roles/openshift_hosted/meta/main.yml21
1 files changed, 20 insertions, 1 deletions
diff --git a/roles/openshift_hosted/meta/main.yml b/roles/openshift_hosted/meta/main.yml
index 74c50ae1d..ca5e88b15 100644
--- a/roles/openshift_hosted/meta/main.yml
+++ b/roles/openshift_hosted/meta/main.yml
@@ -11,4 +11,23 @@ galaxy_info:
- 7
categories:
- cloud
-dependencies: []
+dependencies:
+- role: openshift_cli
+- role: openshift_hosted_facts
+- role: openshift_projects
+ 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