diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 10:26:53 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 10:26:53 -0300 |
| commit | efb153693104976e86a91ebf6bf236448be5a84d (patch) | |
| tree | 931258201dfc7c8de85a7b4053ecca4666ebe6db | |
| parent | a7f71eab952e574db89ae9cac2e15922443db048 (diff) | |
| download | openshift-efb153693104976e86a91ebf6bf236448be5a84d.tar.gz openshift-efb153693104976e86a91ebf6bf236448be5a84d.tar.bz2 openshift-efb153693104976e86a91ebf6bf236448be5a84d.tar.xz openshift-efb153693104976e86a91ebf6bf236448be5a84d.zip | |
Drop unnecessary node playbook version calculation.
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 16 | ||||
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 5e92b5cbd..bffac0e56 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -109,22 +109,6 @@ with_items: "{{ groups.oo_nodes_to_config | default([]) }}" when: hostvars[item].openshift.common.is_containerized | bool and (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config) -- name: Determine openshift_version to install on nodes - hosts: oo_nodes_to_config - any_errors_fatal: true - tasks: - - debug: var=hostvars[groups.oo_first_master.0].openshift.common.version - - debug: var=openshift.common.version - - name: Set openshift_version to match first master for new node - set_fact: - openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift.common.version }}" - when: openshift.common.version is not defined - - name: Set openshift_version to currently installed version - set_fact: - openshift_version: "{{ openshift.common.version }}" - when: openshift.common.version is defined - - debug: var=openshift_version - - name: Configure node instances hosts: oo_containerized_master_nodes serial: 1 diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml index c2ba63a1d..00f761987 100644 --- a/roles/openshift_docker/tasks/main.yml +++ b/roles/openshift_docker/tasks/main.yml @@ -29,7 +29,7 @@ openshift_version: "{{ openshift.common.version }}" when: openshift.common.version is defined and openshift_version is not defined -- name: Lookup latest OpenShift rpm version if none specified +- name: Install latest OpenShift rpm to check version action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" when: not is_containerized | bool and openshift_version is not defined |