summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-21 16:08:41 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-04 17:42:08 -0500
commit83c357e25ee657600982103ad5c7fedc86ad4267 (patch)
tree42e527d293abc9791d1a86786428f059013451d9
parent9f19afc7529bd7293433b27e834b9ee3479e646f (diff)
downloadopenshift-83c357e25ee657600982103ad5c7fedc86ad4267.tar.gz
openshift-83c357e25ee657600982103ad5c7fedc86ad4267.tar.bz2
openshift-83c357e25ee657600982103ad5c7fedc86ad4267.tar.xz
openshift-83c357e25ee657600982103ad5c7fedc86ad4267.zip
Install node packages in one task instead of 3
This commit reduces the number of package tasks from 3 to 1.
-rw-r--r--roles/openshift_node/tasks/install.yml38
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