summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-05-01 11:29:40 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-05-06 02:10:16 -0400
commit5f09b0e1d3b27fb81473bfd92d424358505969e5 (patch)
tree83d8ff2ab039bf64d48dbfb0626db61d0c86d0d3 /playbooks/common
parente0b2d98a6cac21cfa555afe4d660cb62c1180856 (diff)
downloadopenshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.gz
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.bz2
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.xz
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.zip
openshift_fact and misc fixes
- Do not attempt to fetch file to same file location when playbooks are run locally on master - Fix for openshift_facts when run against a host in a VPC that does not assign internal/external hostnames or ips - Fix setting of labels and annotations on node instances and in openshift_facts - converted openshift_facts to use json for local_fact storage instead of an ini file, included code that should migrate existing ini users to json - added region/zone setting to byo inventory - Fix fact related bug where deployment_type was being set on node role instead of common role for node hosts
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