summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-16 15:15:03 -0400
committerJhon Honce <jhonce@redhat.com>2015-03-24 11:21:57 -0700
commit13dc8505feb93adc311a4a2d8e714c7d1e61cf1f (patch)
tree06fc7b83c3b8922cb32cb3529d855e9aa0c533ab
parent6ad94864f7d985f1bb671536bd398ea4bcd0f163 (diff)
downloadopenshift-13dc8505feb93adc311a4a2d8e714c7d1e61cf1f.tar.gz
openshift-13dc8505feb93adc311a4a2d8e714c7d1e61cf1f.tar.bz2
openshift-13dc8505feb93adc311a4a2d8e714c7d1e61cf1f.tar.xz
openshift-13dc8505feb93adc311a4a2d8e714c7d1e61cf1f.zip
Fix openshift_master_ips and openshift_master_public_ips resolution
- don't use set_fact on localhost for openshift_master_ips and openshift_master_public_ips - we are only using it for the configure play - move definition to vars section of configure play - otherwise we'd have to set openshift_master_ips and openshift_master_public_ips from hostvars['localhost'] and since we aren't refrerencing it anywhere else, might as well just do it in vars instead of set_fact on locahost.
-rw-r--r--playbooks/gce/openshift-node/config.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index 7f80b90a7..9d87c4e8f 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -53,7 +53,6 @@
roles:
- openshift_register_nodes
tasks:
- tasks:
- name: Create local temp directory for syncing certs
local_action: command /usr/bin/mktemp -d /tmp/openshift-ansible-XXXXXXX
register: mktemp
@@ -69,7 +68,7 @@
#
- name: Configure instances
hosts: oo_nodes_to_config
- vars_files:
+vars_files:
- vars.yml
vars:
openshift_master_group: tag_env-host-type-{{ oo_env }}-openshift-master