diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-16 08:49:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 08:49:07 -0500 |
| commit | 7dcc6292e2ca89fe22675491299cf5853860bed8 (patch) | |
| tree | 956a8f8d2cac46f5529604c2201facea1611ea0d /playbooks/byo/openshift-master | |
| parent | 45532f4578f99243f14493aa42b4ffd7b0fb8265 (diff) | |
| parent | e5f4823d6e4191367178f743ddd5e0885598e8cf (diff) | |
| download | openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.gz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.bz2 openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.xz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.zip | |
Merge pull request #6064 from mtnbikenc/consolidate-init
Playbook Consolidation - Initialization
Diffstat (limited to 'playbooks/byo/openshift-master')
| -rw-r--r-- | playbooks/byo/openshift-master/additional_config.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-master/certificates.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-master/restart.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-master/scaleup.yml | 9 |
5 files changed, 10 insertions, 15 deletions
diff --git a/playbooks/byo/openshift-master/additional_config.yml b/playbooks/byo/openshift-master/additional_config.yml index b3d7b5731..1454190b2 100644 --- a/playbooks/byo/openshift-master/additional_config.yml +++ b/playbooks/byo/openshift-master/additional_config.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-master/additional_config.yml diff --git a/playbooks/byo/openshift-master/certificates.yml b/playbooks/byo/openshift-master/certificates.yml index e147dcba1..344985244 100644 --- a/playbooks/byo/openshift-master/certificates.yml +++ b/playbooks/byo/openshift-master/certificates.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-master/certificates.yml diff --git a/playbooks/byo/openshift-master/config.yml b/playbooks/byo/openshift-master/config.yml index 98be0c448..913525e65 100644 --- a/playbooks/byo/openshift-master/config.yml +++ b/playbooks/byo/openshift-master/config.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-master/config.yml diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml index 8950efd00..d2031d928 100644 --- a/playbooks/byo/openshift-master/restart.yml +++ b/playbooks/byo/openshift-master/restart.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-master/restart.yml diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml index a09edd55a..4fdec5e7d 100644 --- a/playbooks/byo/openshift-master/scaleup.yml +++ b/playbooks/byo/openshift-master/scaleup.yml @@ -1,5 +1,5 @@ --- -- include: ../openshift-cluster/initialize_groups.yml +- include: ../../init/evaluate_groups.yml - name: Ensure there are new_masters or new_nodes hosts: localhost @@ -13,8 +13,11 @@ add hosts to the new_masters and new_nodes host groups to add masters. when: - - (g_new_master_hosts | default([]) | length == 0) and (g_new_node_hosts | default([]) | length == 0) + - g_new_master_hosts | default([]) | length == 0 + - g_new_node_hosts | default([]) | length == 0 -- include: ../../common/openshift-cluster/std_include.yml +# Need a better way to do the above check for node without +# running evaluate_groups and init/main.yml +- include: ../../init/main.yml - include: ../../common/openshift-master/scaleup.yml |