summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-15 11:20:29 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-15 11:20:29 -0400
commitbd1976e5e90847ed5d22fdbef9ecf69e7883458c (patch)
treef838f1de42b4d7e7a607bb5f6d8459c1cf099873 /roles
parent28e470b4e6bb526a489aba65e875ac4672e279e2 (diff)
parent9700b7b66789f300bbe99743719ca699457b3b91 (diff)
downloadopenshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.gz
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.bz2
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.xz
openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.zip
Merge pull request #1603 from detiber/move_common_common_facts
Move common common facts to openshift_facts
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_cli/meta/main.yml2
-rw-r--r--roles/openshift_cli/tasks/main.yml2
-rw-r--r--roles/openshift_common/tasks/main.yml6
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml3
-rw-r--r--roles/openshift_facts/tasks/main.yml6
-rw-r--r--roles/openshift_node/tasks/main.yml4
-rw-r--r--roles/os_firewall/meta/main.yml3
7 files changed, 11 insertions, 15 deletions
diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml
index 4351e8f24..62de120c6 100644
--- a/roles/openshift_cli/meta/main.yml
+++ b/roles/openshift_cli/meta/main.yml
@@ -12,6 +12,6 @@ galaxy_info:
categories:
- cloud
dependencies:
+- role: openshift_common
- role: openshift_docker
when: openshift.common.is_containerized | bool
-- role: openshift_common
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index 62a4dd690..e82903b81 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -1,8 +1,8 @@
---
+# TODO: move this to a new 'cli' role
- openshift_facts:
role: common
local_facts:
- deployment_type: "{{ openshift_deployment_type }}"
cli_image: "{{ osm_image | default(None) }}"
- name: Install clients
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index a2fcff507..541efe27a 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -19,16 +19,10 @@
openshift_facts:
role: common
local_facts:
- cluster_id: "{{ openshift_cluster_id | default('default') }}"
debug_level: "{{ openshift_debug_level | default(2) }}"
- hostname: "{{ openshift_hostname | default(None) }}"
install_examples: "{{ openshift_install_examples | default(True) }}"
- 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) }}"
sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}"
- deployment_type: "{{ openshift_deployment_type }}"
use_flannel: "{{ openshift_use_flannel | default(None) }}"
use_nuage: "{{ openshift_use_nuage | default(None) }}"
use_manageiq: "{{ openshift_use_manageiq | default(None) }}"
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index 3fb2cd34b..ad7ad3748 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -4,9 +4,6 @@
role: "{{ item.role }}"
local_facts: "{{ item.local_facts }}"
with_items:
- - role: common
- local_facts:
- deployment_type: "{{ openshift_deployment_type }}"
- role: docker
local_facts:
additional_registries: "{{ openshift_docker_additional_registries | default(None) }}"
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 0dbac1b54..89ddb0d98 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -25,4 +25,10 @@
openshift_facts:
role: common
local_facts:
+ deployment_type: "{{ openshift_deployment_type }}"
+ cluster_id: "{{ openshift_cluster_id | default('default') }}"
+ hostname: "{{ openshift_hostname | default(None) }}"
+ ip: "{{ openshift_ip | default(None) }}"
is_containerized: "{{ containerized | default(None) }}"
+ public_hostname: "{{ openshift_public_hostname | default(None) }}"
+ public_ip: "{{ openshift_public_ip | default(None) }}"
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) }}"
diff --git a/roles/os_firewall/meta/main.yml b/roles/os_firewall/meta/main.yml
index 8592371e8..c93335b7b 100644
--- a/roles/os_firewall/meta/main.yml
+++ b/roles/os_firewall/meta/main.yml
@@ -11,4 +11,5 @@ galaxy_info:
- 7
categories:
- system
-dependencies: []
+dependencies:
+- { role: openshift_facts }