diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-07-08 10:11:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 10:11:04 -0400 |
| commit | 69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4 (patch) | |
| tree | 0419cfc12d414a95c987f7667f6618fba923c522 /roles/openshift_hosted/meta/main.yml | |
| parent | 8a0c9b6b6a9820b38694cb23979ffc7a8c358588 (diff) | |
| parent | 57dfae185d3d0e02ebe515263c54867bee37b45e (diff) | |
| download | openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.gz openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.bz2 openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.xz openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.zip | |
Merge pull request #2023 from abutcher/openshift-hosted
Various hosted component improvements
Diffstat (limited to 'roles/openshift_hosted/meta/main.yml')
| -rw-r--r-- | roles/openshift_hosted/meta/main.yml | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/roles/openshift_hosted/meta/main.yml b/roles/openshift_hosted/meta/main.yml index 75dfc24c3..c7d20f88b 100644 --- a/roles/openshift_hosted/meta/main.yml +++ b/roles/openshift_hosted/meta/main.yml @@ -12,5 +12,26 @@ galaxy_info: categories: - cloud dependencies: -- openshift_common -- openshift_hosted_facts +- 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 |