diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:10:35 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:10:35 -0500 |
| commit | c3bd6a3489dd0473334543024efa2c3c96ba8be2 (patch) | |
| tree | 6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /playbooks/common/openshift-node | |
| parent | 1d8e743921a48a5abd2ca75323321f6db261101b (diff) | |
| parent | b151e33e7e49d1de1c58286342d09cc9eba57287 (diff) | |
| download | openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.gz openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.bz2 openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.xz openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.zip | |
Merge branch 'master' into int
Diffstat (limited to 'playbooks/common/openshift-node')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 5 |
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 |