diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-12 20:15:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 20:15:24 -0500 |
| commit | 92723e8a6425e7a8b03d3413586cdd09b74d8a3e (patch) | |
| tree | d2a6a3d2b4255a85629669c6a40fa9e757ea6925 /playbooks/common | |
| parent | eb506980d5457d32737eecfbc9c83d4a1942e95b (diff) | |
| parent | 558796bc195e6f17b11918ea877eb55c8ed0bb26 (diff) | |
| download | openshift-92723e8a6425e7a8b03d3413586cdd09b74d8a3e.tar.gz openshift-92723e8a6425e7a8b03d3413586cdd09b74d8a3e.tar.bz2 openshift-92723e8a6425e7a8b03d3413586cdd09b74d8a3e.tar.xz openshift-92723e8a6425e7a8b03d3413586cdd09b74d8a3e.zip | |
Merge pull request #3895 from mtnbikenc/playbook-refactor
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/std_include.yml | 24 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 24 |
3 files changed, 3 insertions, 49 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml index d96a78c4c..57580406c 100644 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ b/playbooks/common/openshift-cluster/openshift_logging.yml @@ -1,11 +1,13 @@ --- +- include: evaluate_groups.yml + - name: OpenShift Aggregated Logging hosts: oo_first_master roles: - openshift_logging - name: Update Master configs - hosts: masters:!oo_first_master + hosts: oo_masters:!oo_first_master tasks: - block: - include_role: diff --git a/playbooks/common/openshift-cluster/std_include.yml b/playbooks/common/openshift-cluster/std_include.yml index 74cc1d527..6ed31a644 100644 --- a/playbooks/common/openshift-cluster/std_include.yml +++ b/playbooks/common/openshift-cluster/std_include.yml @@ -1,28 +1,4 @@ --- -- name: Create initial host groups for localhost - hosts: localhost - connection: local - become: no - gather_facts: no - tags: - - always - tasks: - - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - name: Evaluate group l_oo_all_hosts - add_host: - name: "{{ item }}" - groups: l_oo_all_hosts - with_items: "{{ g_all_hosts | default([]) }}" - changed_when: no - -- name: Create initial host groups for all hosts - hosts: l_oo_all_hosts - gather_facts: no - tags: - - always - tasks: - - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - include: evaluate_groups.yml tags: - always diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index cc1fa5a0a..cbf6d58b3 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -1,28 +1,4 @@ --- -- name: Create initial host groups for localhost - hosts: localhost - connection: local - become: no - gather_facts: no - tags: - - always - tasks: - - include_vars: ../../../byo/openshift-cluster/cluster_hosts.yml - - name: Evaluate group l_oo_all_hosts - add_host: - name: "{{ item }}" - groups: l_oo_all_hosts - with_items: "{{ g_all_hosts | default([]) }}" - changed_when: False - -- name: Create initial host groups for all hosts - hosts: l_oo_all_hosts - gather_facts: no - tags: - - always - tasks: - - include_vars: ../../../byo/openshift-cluster/cluster_hosts.yml - - include: ../evaluate_groups.yml vars: # Do not allow adding hosts during upgrade. |