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 /playbooks/common/openshift-cluster | |
| 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 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/validate_hostnames.yml | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 6d7cefc8e..31ba8c4a9 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -212,13 +212,10 @@ - name: Update deployment type hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config + vars: + openshift_deployment_type: "{{ deployment_type }}" roles: - openshift_facts - post_tasks: - - openshift_facts: - role: common - local_facts: - deployment_type: "{{ deployment_type }}" - name: Update master facts hosts: oo_masters_to_config diff --git a/playbooks/common/openshift-cluster/validate_hostnames.yml b/playbooks/common/openshift-cluster/validate_hostnames.yml index fd82997b9..0f562e019 100644 --- a/playbooks/common/openshift-cluster/validate_hostnames.yml +++ b/playbooks/common/openshift-cluster/validate_hostnames.yml @@ -6,14 +6,6 @@ roles: - openshift_facts tasks: - - openshift_facts: - role: "{{ item.role }}" - local_facts: "{{ item.local_facts }}" - with_items: - - role: common - local_facts: - hostname: "{{ openshift_hostname | default(None) }}" - public_hostname: "{{ openshift_public_hostname | default(None) }}" - shell: getent ahostsv4 {{ openshift.common.hostname }} | head -n 1 | awk '{ print $1 }' register: lookupip |