diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-25 09:33:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 09:33:21 -0400 |
| commit | d08a872a0392c100e86eed41f5d5372d226538c0 (patch) | |
| tree | 14286133d094e90882258506cf34d25ada484f37 /playbooks/common/openshift-cluster | |
| parent | 0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5 (diff) | |
| parent | 3f2d71a1bfb589778733dd8eb0ccd6b1dac31d79 (diff) | |
| download | openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.gz openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.bz2 openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.xz openshift-d08a872a0392c100e86eed41f5d5372d226538c0.zip | |
Merge pull request #2052 from sdodson/metrics
Metrics improvements
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 22 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 6 |
2 files changed, 27 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 5cf5df08e..d6a99fcda 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,14 +1,22 @@ --- - include: evaluate_groups.yml + tags: + - always - include: initialize_facts.yml + tags: + - always - include: validate_hostnames.yml + tags: + - node - include: initialize_openshift_version.yml - name: Set oo_options hosts: oo_all_hosts + tags: + - always tasks: - set_fact: openshift_docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') }}" @@ -30,15 +38,29 @@ when: openshift_docker_log_options is not defined - include: ../openshift-etcd/config.yml + tags: + - etcd - include: ../openshift-nfs/config.yml + tags: + - nfs - include: ../openshift-loadbalancer/config.yml + tags: + - loadbalancer - include: ../openshift-master/config.yml + tags: + - master - include: additional_config.yml + tags: + - master - include: ../openshift-node/config.yml + tags: + - node - include: openshift_hosted.yml + tags: + - hosted diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 4d4a09828..c90c85cbd 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -1,5 +1,7 @@ - name: Create persistent volumes hosts: oo_first_master + tags: + - hosted vars: persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}" persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}" @@ -9,6 +11,8 @@ - name: Create Hosted Resources hosts: oo_first_master + tags: + - hosted pre_tasks: - set_fact: openshift_hosted_router_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" @@ -36,6 +40,6 @@ openshift_serviceaccounts_sccs: - privileged when: not openshift.common.version_gte_3_2_or_1_2 + - role: openshift_hosted - role: openshift_metrics when: openshift.hosted.metrics.deploy | bool - - role: openshift_hosted |