Merge "Add CentOS7 support to the utility playbook"

playbooks/utility-install.yml

@@ -49,19 +49,28 @@
       until: apt_update|success
       retries: 5
       delay: 2
+      when:
+        - ansible_pkg_mgr == 'apt'
       tags:
         - utility-apt-packages
     - name: Install apt packages
       apt:
         pkg: "{{ item }}"
         state: latest
-      register: install_packages
+      with_items: "{{ utility_apt_packages }}"
-      until: install_packages|success
+      when:
-      retries: 5
+        - ansible_pkg_mgr == 'apt'
-      delay: 2
-      with_items: "{{ utility_apt_packages | default([]) }}"
       tags:
         - utility-apt-packages
+    - name: Install yum packages
+      yum:
+        pkg: "{{ item }}"
+        state: latest
+      with_items: "{{ utility_yum_packages }}"
+      when:
+        - ansible_pkg_mgr == 'yum'
+      tags:
+        - utility-yum-packages
     - name: Install pip packages
       pip:
         name: "{{ item }}"
@@ -86,6 +95,8 @@
   vars:
     utility_apt_packages:
       - git
+    utility_yum_packages:
+      - git
     utility_pip_packages:
       - python-openstackclient
       - python-ceilometerclient