diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-10 14:52:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 14:52:31 -0500 |
| commit | 15054dfdbe77dddbca393c3559c4858d9a2c5087 (patch) | |
| tree | b8efbb0e7442c6e6ab722c0904254ec3f1b1abdf /roles/openshift_hosted | |
| parent | f83018779b157f6ba9c88a5439557c8985c87451 (diff) | |
| parent | d113f03968476c4bf899e20317bfa644ee539560 (diff) | |
| download | openshift-15054dfdbe77dddbca393c3559c4858d9a2c5087.tar.gz openshift-15054dfdbe77dddbca393c3559c4858d9a2c5087.tar.bz2 openshift-15054dfdbe77dddbca393c3559c4858d9a2c5087.tar.xz openshift-15054dfdbe77dddbca393c3559c4858d9a2c5087.zip | |
Merge pull request #3060 from abutcher/return-deps-to-roles
Return role dependencies to roles for openshift_{hosted,master,node}
Diffstat (limited to 'roles/openshift_hosted')
| -rw-r--r-- | roles/openshift_hosted/meta/main.yml | 21 |
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 |