diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-19 17:21:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 17:21:46 -0500 |
| commit | 3c1eba1488e1d3570320381ee5eee6ea760e7659 (patch) | |
| tree | dee97878b906bd8ceea20ee2af9737a422d7254c /playbooks/init | |
| parent | 7ad419c31b79c85d610143f95777040db4b5b1b7 (diff) | |
| parent | 6646d0275739585f5c1ad59e6b27c01fbc374e02 (diff) | |
| download | openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.gz openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.bz2 openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.xz openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.zip | |
Merge pull request #6784 from mgugino-upstream-stage/fix-node-scaleup
Fix node scaleup plays
Diffstat (limited to 'playbooks/init')
| -rw-r--r-- | playbooks/init/base_packages.yml | 4 | ||||
| -rw-r--r-- | playbooks/init/facts.yml | 6 | ||||
| -rw-r--r-- | playbooks/init/repos.yml | 4 | ||||
| -rw-r--r-- | playbooks/init/sanity_checks.yml | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/playbooks/init/base_packages.yml b/playbooks/init/base_packages.yml index 15b3dd492..e1052fb6c 100644 --- a/playbooks/init/base_packages.yml +++ b/playbooks/init/base_packages.yml @@ -1,6 +1,8 @@ --- +# l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. + - name: Install packages necessary for installer - hosts: oo_all_hosts + hosts: "{{ l_scale_up_hosts | default('oo_all_hosts') }}" any_errors_fatal: true tasks: - when: diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml index 8e4206948..df17c4043 100644 --- a/playbooks/init/facts.yml +++ b/playbooks/init/facts.yml @@ -5,9 +5,9 @@ tasks: - name: Initialize host facts - # l_upgrade_non_node_hosts is passed in via play during control-plane-only - # upgrades; otherwise oo_all_hosts is used. - hosts: "{{ l_upgrade_non_node_hosts | default('oo_all_hosts') }}" + # l_init_fact_hosts is passed in via play during control-plane-only + # upgrades and scale-up plays; otherwise oo_all_hosts is used. + hosts: "{{ l_init_fact_hosts | default('oo_all_hosts') }}" tasks: - name: load openshift_facts module import_role: diff --git a/playbooks/init/repos.yml b/playbooks/init/repos.yml index 667f38ddd..655a7e83a 100644 --- a/playbooks/init/repos.yml +++ b/playbooks/init/repos.yml @@ -1,6 +1,8 @@ --- +# l_scale_up_hosts may be passed in via prerequisites.yml during scaleup plays. + - name: Setup yum repositories for all hosts - hosts: oo_all_hosts + hosts: "{{ l_scale_up_hosts | default('oo_all_hosts') }}" gather_facts: no tasks: - name: subscribe instances to Red Hat Subscription Manager diff --git a/playbooks/init/sanity_checks.yml b/playbooks/init/sanity_checks.yml index 52bcf42c0..fbbb3f8fb 100644 --- a/playbooks/init/sanity_checks.yml +++ b/playbooks/init/sanity_checks.yml @@ -1,4 +1,5 @@ --- +# l_sanity_check_hosts may be passed in during scale-up plays - name: Verify Requirements hosts: oo_first_master roles: @@ -11,5 +12,5 @@ # Thus, sanity_checks cannot gather new information about any hosts. - name: Run variable sanity checks sanity_checks: - check_hosts: "{{ groups['oo_all_hosts'] }}" + check_hosts: "{{ l_sanity_check_hosts | default(groups['oo_all_hosts']) }}" run_once: True |