diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-15 03:20:11 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-15 05:04:09 -0400 |
| commit | 9700b7b66789f300bbe99743719ca699457b3b91 (patch) | |
| tree | d4f0237240248580a9d842b0506e1226ad78125b /roles/openshift_node | |
| parent | c633ce7b8707f311763fa4b707f1ea159265c7d4 (diff) | |
| download | openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.gz openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.bz2 openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.xz openshift-9700b7b66789f300bbe99743719ca699457b3b91.zip | |
Move common common facts to openshift_facts
- Prevents roles that need common facts from needing to require
openshift_common, which pulls in the openshift binary.
- Add dependency on openshift_facts to os_firewall, since it uses
openshift.common facts
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 54ba2aa6a..8768d426b 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -11,10 +11,8 @@ with_items: - role: common local_facts: - hostname: "{{ openshift_hostname | default(none) }}" - public_hostname: "{{ openshift_public_hostname | default(none) }}" - deployment_type: "{{ openshift_deployment_type }}" # TODO: Replace this with a lookup or filter plugin. + # TODO: Move this to the node role dns_ip: "{{ openshift_dns_ip | default(openshift_master_cluster_vip | default(None if openshift.common.version_gte_3_1_or_1_1 | bool else openshift_node_first_master_ip | default(None, true), true), true) }}" |