summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-10 18:41:32 -0700
committerGitHub <noreply@github.com>2017-10-10 18:41:32 -0700
commited94267382f9629ac110f47df562d9a2b6f7ccb4 (patch)
tree422a626cf4373eee7cdd1019701e0f67f3670a10 /playbooks/common/openshift-master
parentbf4bb23ddfa2d4c9b6d56d09ef8a16e5e9b5b009 (diff)
parentf6608b45f0cab8359e4e2c0d5504b68ef4e2a7bf (diff)
downloadopenshift-ed94267382f9629ac110f47df562d9a2b6f7ccb4.tar.gz
openshift-ed94267382f9629ac110f47df562d9a2b6f7ccb4.tar.bz2
openshift-ed94267382f9629ac110f47df562d9a2b6f7ccb4.tar.xz
openshift-ed94267382f9629ac110f47df562d9a2b6f7ccb4.zip
Merge pull request #5659 from mtnbikenc/fix-checkpointing
Automatic merge from submit-queue. Allow checkpoint status to work across all groups Conditionals placed in inventories were not being applied to localhost causing the checkpoint status to not be updated properly. Moving to the `oo_all_hosts` group will correctly pick up the conditional and apply regardless of which group (or host) may have that conditional set.
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/additional_config.yml6
-rw-r--r--playbooks/common/openshift-master/config.yml6
2 files changed, 4 insertions, 8 deletions
diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml
index ee76e2ed7..1b3eb268a 100644
--- a/playbooks/common/openshift-master/additional_config.yml
+++ b/playbooks/common/openshift-master/additional_config.yml
@@ -1,7 +1,6 @@
---
- name: Master Additional Install Checkpoint Start
- hosts: localhost
- connection: local
+ hosts: oo_all_hosts
gather_facts: false
tasks:
- name: Set Master Additional install 'In Progress'
@@ -37,8 +36,7 @@
when: openshift_use_flannel | default(false) | bool
- name: Master Additional Install Checkpoint End
- hosts: localhost
- connection: local
+ hosts: oo_all_hosts
gather_facts: false
tasks:
- name: Set Master Additional install 'Complete'
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 04e2bdbbf..6e57f282e 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -1,7 +1,6 @@
---
- name: Master Install Checkpoint Start
- hosts: localhost
- connection: local
+ hosts: oo_all_hosts
gather_facts: false
tasks:
- name: Set Master install 'In Progress'
@@ -227,8 +226,7 @@
r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
- name: Master Install Checkpoint End
- hosts: localhost
- connection: local
+ hosts: oo_all_hosts
gather_facts: false
tasks:
- name: Set Master install 'Complete'