diff options
author | Jhon Honce <jhonce@redhat.com> | 2015-04-07 09:32:46 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2015-04-07 09:32:46 -0700 |
commit | 675f6165a83b86c1a498c327161f928d218ee244 (patch) | |
tree | 0ad271a03feac6bde2a296e6011498cd6455fa99 /roles/openshift_common/tasks/main.yml | |
parent | 59e69dd21c19bf745392b5e83bd652630ee870cc (diff) | |
parent | 8a4888ad30ce7c5898caac47614da2e13a759320 (diff) | |
download | openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.gz openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.bz2 openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.xz openshift-675f6165a83b86c1a498c327161f928d218ee244.zip |
Merge pull request #121 from detiber/nodeRegistrationChangesMaster
Node registration changes master
Diffstat (limited to 'roles/openshift_common/tasks/main.yml')
-rw-r--r-- | roles/openshift_common/tasks/main.yml | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 07737a71f..941190534 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -1,19 +1,16 @@ --- -- name: Set hostname - hostname: name={{ openshift_hostname }} +- name: Set common OpenShift facts + openshift_facts: + role: 'common' + local_facts: + cluster_id: "{{ openshift_cluster_id | default('default') }}" + debug_level: "{{ openshift_debug_level | default(0) }}" + hostname: "{{ openshift_hostname | default(None) }}" + ip: "{{ openshift_ip | default(None) }}" + public_hostname: "{{ openshift_public_hostname | default(None) }}" + public_ip: "{{ openshift_public_ip | default(None) }}" + use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}" -- name: Configure local facts file - file: path=/etc/ansible/facts.d/ state=directory mode=0750 +- name: Set hostname + hostname: name={{ openshift.common.hostname }} -- name: Set common OpenShift facts - include: set_facts.yml - facts: - - section: common - option: env - value: "{{ openshift_env | default('default') }}" - - section: common - option: host_type - value: "{{ openshift_host_type }}" - - section: common - option: debug_level - value: "{{ openshift_debug_level }}" |