diff options
| author | Russell Teague <rteague@redhat.com> | 2017-03-28 16:36:01 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-04-12 15:34:01 -0400 |
| commit | 558796bc195e6f17b11918ea877eb55c8ed0bb26 (patch) | |
| tree | 404b66281eda80528d6de48bf9243b3025641188 /playbooks/byo/openshift-master | |
| parent | 2942b0327520c458230501678c5ff877bc038f0d (diff) | |
| download | openshift-558796bc195e6f17b11918ea877eb55c8ed0bb26.tar.gz openshift-558796bc195e6f17b11918ea877eb55c8ed0bb26.tar.bz2 openshift-558796bc195e6f17b11918ea877eb55c8ed0bb26.tar.xz openshift-558796bc195e6f17b11918ea877eb55c8ed0bb26.zip | |
Refactor initialize groups tasks
Two tasks for initializing group names for the byo playbooks was located
in the common folder in the std_include.yml file. Byo dependencies
should not be in the common folder. The two tasks have been removed
from common/openshift-cluster/std_include.yml to a new file
byo/openshift-cluster/initialize_groups.yml. All references where these
tasks were included from either std_include.yml or other various files
have been updated to use the byo initialize_groups.yml. The methodology
implemented follows the pattern of having groups set up in byo then
calling out to playbooks in common, which are common to all deployments.
Diffstat (limited to 'playbooks/byo/openshift-master')
| -rw-r--r-- | playbooks/byo/openshift-master/restart.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-master/scaleup.yml | 24 |
2 files changed, 5 insertions, 23 deletions
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml index 21e4cff1b..7988863f3 100644 --- a/playbooks/byo/openshift-master/restart.yml +++ b/playbooks/byo/openshift-master/restart.yml @@ -1,4 +1,8 @@ --- +- include: ../openshift-cluster/initialize_groups.yml + tags: + - always + - include: ../../common/openshift-cluster/std_include.yml tags: - always diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml index a5705e990..8aa07a664 100644 --- a/playbooks/byo/openshift-master/scaleup.yml +++ b/playbooks/byo/openshift-master/scaleup.yml @@ -1,27 +1,5 @@ --- -- 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: ../openshift-cluster/initialize_groups.yml - include: ../../common/openshift-master/scaleup.yml vars: |