diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-15 11:20:29 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-15 11:20:29 -0400 |
| commit | bd1976e5e90847ed5d22fdbef9ecf69e7883458c (patch) | |
| tree | f838f1de42b4d7e7a607bb5f6d8459c1cf099873 /playbooks/common/openshift-cluster | |
| parent | 28e470b4e6bb526a489aba65e875ac4672e279e2 (diff) | |
| parent | 9700b7b66789f300bbe99743719ca699457b3b91 (diff) | |
| download | openshift-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 '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 |