diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-10 09:15:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 09:15:11 -0500 |
| commit | ee2d4b8e66a344e8f6ca12cbc9362a80a07555d0 (patch) | |
| tree | 435ad9e15b13e119dcb4a0d3dc9a519fa3ce295e /roles/openshift_node/tasks | |
| parent | 19ae452d558d7f04f49d024bf82fcb7221c8fa0d (diff) | |
| parent | 83c357e25ee657600982103ad5c7fedc86ad4267 (diff) | |
| download | openshift-ee2d4b8e66a344e8f6ca12cbc9362a80a07555d0.tar.gz openshift-ee2d4b8e66a344e8f6ca12cbc9362a80a07555d0.tar.bz2 openshift-ee2d4b8e66a344e8f6ca12cbc9362a80a07555d0.tar.xz openshift-ee2d4b8e66a344e8f6ca12cbc9362a80a07555d0.zip | |
Merge pull request #6553 from mgugino-upstream-stage/node-reduce-package-commands
Install node packages in one task instead of 3
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/install.yml | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml index 55738d759..a4a9c1237 100644 --- a/roles/openshift_node/tasks/install.yml +++ b/roles/openshift_node/tasks/install.yml @@ -1,28 +1,18 @@ --- -- when: not openshift_is_containerized | bool - block: - - name: Install Node package - package: - name: "{{ openshift_service_type }}-node{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}" - state: present - register: result - until: result is succeeded - - - name: Install sdn-ovs package - package: - name: "{{ openshift_service_type }}-sdn-ovs{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}" - state: present - when: - - openshift_node_use_openshift_sdn | bool - register: result - until: result is succeeded - - - name: Install conntrack-tools package - package: - name: "conntrack-tools" - state: present - register: result - until: result is succeeded +- name: Install Node package, sdn-ovs, conntrack packages + package: + name: "{{ item.name }}" + state: present + register: result + until: result is succeeded + with_items: + - name: "{{ openshift_service_type }}-node{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}" + - name: "{{ openshift_service_type }}-sdn-ovs{{ (openshift_pkg_version | default('')) | lib_utils_oo_image_tag_to_rpm_version(include_dash=True) }}" + install: "{{ openshift_node_use_openshift_sdn | bool }}" + - name: "conntrack-tools" + when: + - not openshift_is_containerized | bool + - item['install'] | default(True) | bool - when: - openshift_is_containerized | bool |