Merge "Remove with_items for 'yum/package'"

docker/services/gnocchi-api.yaml

@@ -304,12 +304,13 @@ outputs:
             - httpd_running|bool
           service: name=httpd state=stopped enabled=no
         - name: Update gnocchi packages
-          package: name={{ item }} state=latest
+          package:
+            name:
+              - openstack-gnocchi*
+              - numpy
+            state: latest
           # (pradk): We have to explicitly update numpy as its obsoleted
           # by python2-numpy.
-          with_items:
-            - openstack-gnocchi*
-            - numpy
           when:
             - step|int == 6
             - is_bootstrap_node|bool

docker/services/nova-compute.yaml

@@ -289,18 +289,20 @@ outputs:
               when: iha_nodes.stdout|lower | search('"'+ansible_hostname|lower+'"')
       upgrade_tasks:
         - name: Remove openstack-nova-compute and python-nova package during upgrade
-          package: name={{ item }} state=removed
-          with_items:
-            - openstack-nova-compute
-            - python-nova
+          package:
+            name:
+              - openstack-nova-compute
+              - python-nova
+            state: removed
           ignore_errors: True
           when: step|int == 2
       update_tasks:
-        - name: Remove openstack-nova-compute and python-nova package during update
-          package: name={{ item }} state=removed
-          with_items:
-            - openstack-nova-compute
-            - python-nova
+        - name: Remove openstack-nova-compute and python-nova package during upgrade
+          package:
+            name:
+              - openstack-nova-compute
+              - python-nova
+            state: removed
           ignore_errors: True
           when: step|int == 2
       post_upgrade_tasks:

docker/services/octavia-worker.yaml

@@ -154,11 +154,12 @@ outputs:
               /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
           ignore_errors: true
         - name: Ensure packages required for configuring octavia are present
-          package: name={{item}}  state=present
-          with_items:
-            - python2-neutronclient
-            - python2-openstackclient
-            - openssl
+          package:
+            name:
+              - python2-neutronclient
+              - python2-openstackclient
+              - openssl
+            state: present
           when: {get_param: EnablePackageInstall}
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:

docker/services/swift-storage.yaml

@@ -561,13 +561,14 @@ outputs:
               set_fact:
                 remove_swift_package: {get_param: UpgradeRemoveUnusedPackages}
             - name: Remove openstack-swift-container,object,account packages if operator requests it
-              package: name={{ item }} state=removed
+              package:
+                name:
+                  - openstack-swift-container
+                  - openstack-swift-object
+                  - openstack-swift-account
+                state: removed
               ignore_errors: True
               when: remove_swift_package|bool
-              with_items:
-                - openstack-swift-container
-                - openstack-swift-object
-                - openstack-swift-account
       update_tasks:
         - name: Ensure rsyncd pid file is absent
           file: