diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-01 10:24:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 10:24:44 -0400 |
| commit | b903304fa1da8366b71667d5b4e8146d6560bfb8 (patch) | |
| tree | 7120fe6c24d2ebb4c15cfd996c0801effe835575 /playbooks/common/openshift-cluster | |
| parent | 1fd95639364b960d4e388cd4f448a86ac16a718d (diff) | |
| parent | 7ab97920067af0500f1b8ed2eb840e663c4c80e3 (diff) | |
| download | openshift-b903304fa1da8366b71667d5b4e8146d6560bfb8.tar.gz openshift-b903304fa1da8366b71667d5b4e8146d6560bfb8.tar.bz2 openshift-b903304fa1da8366b71667d5b4e8146d6560bfb8.tar.xz openshift-b903304fa1da8366b71667d5b4e8146d6560bfb8.zip | |
Merge pull request #2240 from abutcher/roles-to-playbooks
Speed Improvements
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 23 |
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 |