Attempt to install elrepo_packages in both playbooks

nexcess · Dec 29, 2017 · 2ae31e5 · 2ae31e5
1 parent 1713892
commit 2ae31e5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/tasks/elrepo_kernel.yml b/tasks/elrepo_kernel.yml
@@ -44,16 +44,6 @@
     - elrepo_kernel_installed|changed
     - elrepo_dist == '7'
 
-- name: Ensure that the required elrepo packages are installed
-  become: true
-  yum:
-    disablerepo: "{{ elrepo_disablerepo|join(',') }}"
-    enablerepo: "{{ elrepo_enablerepo|join(',') }}"
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ elrepo_packages }}"
-  when: elrepo_packages|length > 0
-
 - name: Set the default kernel grub is going to boot (<= el6)
   become: true
   lineinfile:
@@ -71,4 +61,16 @@
   when:
     - elrepo_dist >= '7'
     - elrepo_kernel_installed|changed
+
+- name: Ensure that the required elrepo packages are installed
+  become: true
+  yum:
+    disablerepo: "{{ elrepo_disablerepo|join(',') }}"
+    enablerepo: "{{ elrepo_enablerepo|join(',') }}"
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ elrepo_packages }}"
+  when:
+    - elrepo_packages|length > 0
+    - elrepo_yum|success
 ...
diff --git a/tasks/elrepo_repository.yml b/tasks/elrepo_repository.yml
@@ -59,4 +59,16 @@
     key: /etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org
     state: present
   when: elrepo_yum|success
+
+- name: Ensure that the required elrepo packages are installed
+  become: true
+  yum:
+    disablerepo: "{{ elrepo_disablerepo|join(',') }}"
+    enablerepo: "{{ elrepo_enablerepo|join(',') }}"
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ elrepo_packages }}"
+  when:
+    - elrepo_packages|length > 0
+    - elrepo_yum|success
 ...