From c6febeb11af247f156218542f98f52566cf22931 Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Thu, 12 Jan 2017 19:16:03 +0100
Subject: Reduce code duplication using variable

We can use openshift_facts's service_type to determine the package
names.
---
 roles/openshift_preflight/nodes/tasks/main.yml | 29 +++++++-------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

(limited to 'roles/openshift_preflight/nodes/tasks')

diff --git a/roles/openshift_preflight/nodes/tasks/main.yml b/roles/openshift_preflight/nodes/tasks/main.yml
index c98b02bf5..a10e69024 100644
--- a/roles/openshift_preflight/nodes/tasks/main.yml
+++ b/roles/openshift_preflight/nodes/tasks/main.yml
@@ -3,33 +3,18 @@
 - when: not openshift.common.is_containerized | bool
   block:
 
-    - name: main packages for enterprise
-      when:
-        - deployment_type == "openshift-enterprise"
+    - name: main node packages availability
       check_yum_update:
         packages:
-          - atomic-openshift
-          - atomic-openshift-node
-          - atomic-openshift-sdn-ovs
+          - "{{ openshift.common.service_type }}"
+          - "{{ openshift.common.service_type }}-node"
+          - "{{ openshift.common.service_type }}-sdn-ovs"
       register: r
 
     - set_fact:
-        oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'main packages for enterprise'})] }}"
+        oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'main node packages availability'})] }}"
 
-    - name: main packages for origin
-      when:
-        - deployment_type == "origin"
-      check_yum_update:
-        packages:
-          - origin
-          - origin-node
-          - origin-sdn-ovs
-      register: r
-
-    - set_fact:
-        oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'main packages for origin'})] }}"
-
-    - name: other node packages
+    - name: other node packages availability
       check_yum_update:
         packages:
           - docker
@@ -53,4 +38,4 @@
       register: r
 
     - set_fact:
-        oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'other node packages'})] }}"
+        oo_preflight_check_results: "{{ oo_preflight_check_results + [r|combine({'_task': 'other node packages availability'})] }}"
-- 
cgit v1.2.3