summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-04-21 16:44:43 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-04-21 16:44:43 -0400
commita89fe1202bf344a2389d96369420881e10538724 (patch)
treed747fb7df04daabc0c978a2f8d1bf922c665711a /playbooks/common
parent15b76fa1e2aa2ded82fb0392e7c400c3e3fecf4f (diff)
parent3a49a125d8a34ac1dce3eb56f1de0cb4c415a9a8 (diff)
downloadopenshift-a89fe1202bf344a2389d96369420881e10538724.tar.gz
openshift-a89fe1202bf344a2389d96369420881e10538724.tar.bz2
openshift-a89fe1202bf344a2389d96369420881e10538724.tar.xz
openshift-a89fe1202bf344a2389d96369420881e10538724.zip
Merge pull request #164 from detiber/bugFixRunOnMaster
Fix common node config playbook when ansible is run on the first master
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml17
1 files changed, 10 insertions, 7 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index d053d959a..5a6c89489 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -72,12 +72,6 @@
with_items: openshift_nodes
changed_when: False
- - name: Remove the temp directory on the master
- file:
- path: "{{ sync_tmpdir }}"
- state: absent
- changed_when: False
-
- name: Configure node instances
hosts: oo_nodes_to_config
@@ -106,8 +100,17 @@
group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
changed_when: False
+- name: Delete the temporary directory on the master
+ hosts: oo_first_master
+ gather_facts: no
+ vars:
+ sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}"
+ tasks:
+ - file: name={{ sync_tmpdir }} state=absent
+ changed_when: False
+
-- name: Delete temporary directory
+- name: Delete temporary directory on localhost
hosts: localhost
gather_facts: no
tasks: