summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
committerTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
commit124ca40c134a40b2e6823ab3c4bfe329580d7eaa (patch)
tree6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /playbooks/common
parent803b9191f1a3a2bffe94528a8a5cd82adf6f3a42 (diff)
parentc3bd6a3489dd0473334543024efa2c3c96ba8be2 (diff)
downloadopenshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.gz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.bz2
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.xz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.zip
Merge branch 'int' into stg
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 433cfeb87..96641a274 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -15,6 +15,7 @@
local_facts:
hostname: "{{ openshift_hostname | default(None) }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
+ deployment_type: "{{ openshift_deployment_type }}"
- role: node
local_facts:
external_id: "{{ openshift_node_external_id | default(None) }}"
@@ -23,7 +24,6 @@
pod_cidr: "{{ openshift_node_pod_cidr | default(None) }}"
labels: "{{ openshift_node_labels | default(None) }}"
annotations: "{{ openshift_node_annotations | default(None) }}"
- deployment_type: "{{ openshift_deployment_type }}"
- name: Create temp directory for syncing certs
@@ -68,7 +68,6 @@
fetch:
src: "{{ sync_tmpdir }}/{{ item.openshift.common.hostname }}.tgz"
dest: "{{ sync_tmpdir }}/"
- flat: yes
fail_on_missing: yes
validate_checksum: yes
with_items: openshift_nodes
@@ -79,7 +78,7 @@
hosts: oo_nodes_to_config
gather_facts: no
vars:
- sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}"
+ sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}/{{ groups['oo_first_master'][0] }}/{{ hostvars.localhost.mktemp.stdout }}"
openshift_sdn_master_url: "https://{{ hostvars[groups['oo_first_master'][0]].openshift.common.hostname }}:4001"
pre_tasks:
- name: Ensure certificate directory exists