Merge "Switch to generic package module"

ansible/compute-node-discovery.yml

@@ -8,9 +8,9 @@
     controller_host: "{{ groups['controllers'][0] }}"
   tasks:
     - name: Ensure ipmitool is installed
-      yum:
+      package:
         name: ipmitool
-        state: installed
+        state: present
       become: True
       run_once: True
       delegate_to: "{{ controller_host }}"

ansible/idrac-bootstrap.yml

@@ -43,17 +43,17 @@
     # Install Dell server admin tools.
     - block:
         - name: Ensure wget is installed
-          yum:
+          package:
             name: wget
-            state: installed
+            state: present
 
         - name: Ensure Dell srvadmin repository is installed
           shell: "wget -q -O - http://linux.dell.com/repo/hardware/latest/bootstrap.cgi | bash"
 
         - name: Ensure Dell srvadmin-idrac7 package is installed
-          yum:
+          package:
             name: srvadmin-idrac7
-            state: installed
+            state: present
 
         # Configure access to the temporary network on a controller.
         - block:

ansible/kayobe-target-venv.yml

@@ -28,7 +28,7 @@
         - name: Ensure the python-virtualenv package is installed
           package:
             name: python-virtualenv
-            state: installed
+            state: present
           become: True
 
         - name: Ensure global virtualenv directory exists
@@ -78,7 +78,7 @@
         - name: Ensure the python-setuptools package is installed
           package:
             name: python-setuptools
-            state: installed
+            state: present
           become: True
 
         - name: Ensure pip is installed

ansible/kolla-target-venv.yml

@@ -22,7 +22,7 @@
         - name: Ensure the python-virtualenv package is installed
           package:
             name: python-virtualenv
-            state: installed
+            state: present
           become: True
 
         - name: Ensure kolla-ansible virtualenv has the latest version of pip installed

ansible/overcloud-host-image-workaround-cloud-init.yml

@@ -18,7 +18,7 @@
             --connection local
             --become
             -m yum
-            -a "name=libguestfs-tools state=installed"'
+            -a "name=libguestfs-tools state=present"'
         - name: Template cloud-init-repo
           copy:
             content: |

ansible/overcloud-host-image-workaround-resolv.yml

@@ -21,7 +21,7 @@
             --connection local
             --become
             -m yum
-            -a "name=libguestfs-tools state=installed"'
+            -a "name=libguestfs-tools state=present"'
 
         - name: Ensure the overcloud host image has bogus name server entries removed
           command: >

ansible/roles/bootstrap/tasks/main.yml

@@ -5,7 +5,7 @@
 - name: Ensure required packages are installed
   package:
     name: "{{ bootstrap_package_dependencies }}"
-    state: installed
+    state: present
   become: True
 
 - name: Check whether an SSH key exists

ansible/roles/console-allocation/tasks/main.yml

@@ -22,7 +22,7 @@
   local_action:
     module: package
     name: "{{ item }}"
-    state: installed
+    state: present
     use: "{{ console_allocation_package_manager }}"
   become: True
   with_items: "{{ console_allocation_package_dependencies }}"

ansible/roles/dev-tools/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Ensure required packages are installed
-  yum:
+  package:
     name: "{{ dev_tools_packages }}"
-    state: installed
+    state: present
   become: True

ansible/roles/disable-selinux/tasks/main.yml

@@ -1,9 +1,9 @@
 ---
 - name: Ensure required packages are installed
-  yum:
+  package:
     name:
       - libselinux-python
-    state: installed
+    state: present
   become: True
 
 - name: Ensure SELinux is disabled

ansible/roles/ip-allocation/tasks/main.yml

@@ -22,7 +22,7 @@
   local_action:
     module: package
     name: "{{ item }}"
-    state: installed
+    state: present
     use: "{{ ip_allocation_package_manager }}"
   become: True
   with_items: "{{ ip_allocation_package_dependencies }}"

ansible/roles/kolla-ansible/tasks/install.yml

@@ -3,9 +3,9 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Ensure EPEL repo is installed
-  yum:
+  package:
     name: epel-release
-    state: installed
+    state: present
   become: True
   when:
     - ansible_os_family == 'RedHat'
@@ -14,7 +14,7 @@
 - name: Ensure required packages are installed
   package:
     name: "{{ kolla_ansible_package_dependencies }}"
-    state: installed
+    state: present
   become: True
 
 - name: Ensure source code checkout parent directory exists

ansible/roles/kolla-ceph/tasks/config.yml

@@ -3,7 +3,7 @@
 - name: Ensure required packages are installed
   package:
     name: parted
-    state: installed
+    state: present
   become: True
   when: ceph_disks | length > 0
 

ansible/roles/kolla/tasks/install.yml

@@ -1,15 +1,15 @@
 ---
 - name: Ensure EPEL repo is installed
-  yum:
+  package:
     name: epel-release
-    state: installed
+    state: present
   become: True
   when:
     - ansible_os_family == 'RedHat'
     - kolla_install_epel | bool
 
 - name: Ensure required packages are installed
-  yum:
+  package:
     name:
       - gcc
       - libffi-devel
@@ -17,7 +17,7 @@
       - python-devel
       - python-pip
       - python-virtualenv
-    state: installed
+    state: present
   become: True
 
 - name: Ensure source code checkout path exists

ansible/roles/swift-block-devices/tasks/main.yml

@@ -14,7 +14,7 @@
     name:
       - parted
       - xfsprogs
-    state: installed
+    state: present
   become: True
   when: swift_block_devices | length > 0
 

ansible/roles/wipe-disks/tasks/main.yml

@@ -7,7 +7,7 @@
 # any LVM or file system state from them.
 
 - name: Ensure LVM2 is installed
-  yum:
+  package:
     name: lvm2
     state: present
   become: True

ansible/roles/yum/tasks/local-mirror.yml

@@ -24,7 +24,7 @@
 - name: Yum | Install epel-release (CentOS)
   yum:
     name: epel-release
-    state: installed
+    state: present
   become: True
 
 - name: Template | Copy EPEL repo templates (CentOS)