Merge "ansible: replace yum module by package module when possible"

2018-07-24 04:54:04 +00:00 · 2018-07-24 04:54:04 +00:00 · d75fca71ed
parent b0a08fa572 b3a7cfc43f
commit d75fca71ed
69 changed files with 102 additions and 84 deletions
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@ -726,9 +726,9 @@ outputs:
                  when: tripleo_role_name == '{{role.name}}'
 {%- endfor %}
                - name: Openstack Heat Agents package update
-                  yum: name=openstack-heat-agents state=latest
+                  package: name=openstack-heat-agents state=latest
                - name: Update os-collect-config
-                  yum: name=os-collect-config state=latest
+                  package: name=os-collect-config state=latest
                - name: Start os-collect-config back up
                  service: name=os-collect-config state=started enabled=yes
      fast_forward_upgrade_prep_role_tasks: |
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@ -207,7 +207,7 @@ outputs:
              set_fact:
                remove_aodh_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-aodh-api package if operator requests it
-              yum: name=openstack-aodh-api state=removed
+              package: name=openstack-aodh-api state=removed
              ignore_errors: True
              when: remove_aodh_api_package|bool
      metadata_settings:
@ -250,7 +250,9 @@ outputs:
            - aodh_httpd_enabled|bool
            - httpd_running|bool
        - name: Aodh package update
-          shell: yum -y update openstack-aodh*
+          package:
+            name: 'openstack-aodh*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@ -148,7 +148,7 @@ outputs:
              set_fact:
                remove_aodh_evaluator_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-aodh-evaluator package if operator requests it
-              yum: name=openstack-aodh-evaluator state=removed
+              package: name=openstack-aodh-evaluator state=removed
              ignore_errors: True
              when: remove_aodh_evaluator_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@ -148,7 +148,7 @@ outputs:
              set_fact:
                remove_aodh_listener_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-aodh-listener package if operator requests it
-              yum: name=openstack-aodh-listener state=removed
+              package: name=openstack-aodh-listener state=removed
              ignore_errors: True
              when: remove_aodh_listener_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@ -148,7 +148,7 @@ outputs:
              set_fact:
                remove_aodh_notifier_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-aodh-notifier package if operator requests it
-              yum: name=openstack-aodh-notifier state=removed
+              package: name=openstack-aodh-notifier state=removed
              ignore_errors: True
              when: remove_aodh_notifier_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/barbican-api.yaml
+++ b/docker/services/barbican-api.yaml
@ -254,7 +254,7 @@ outputs:
              set_fact:
                remove_barbican_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-barbican-api package if operator requests it
-              yum: name=openstack-barbican-api state=removed
+              package: name=openstack-barbican-api state=removed
              ignore_errors: True
              when: remove_barbican_api_package|bool
      metadata_settings:
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@ -176,7 +176,7 @@ outputs:
              set_fact:
                remove_ceilometer_central_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ceilometer-central package if operator requests it
-              yum: name=openstack-ceilometer-central state=removed
+              package: name=openstack-ceilometer-central state=removed
              ignore_errors: True
              when: remove_ceilometer_central_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@ -149,11 +149,11 @@ outputs:
              set_fact:
                remove_ceilometer_compute_polling_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ceilometer-compute package if operator requests it
-              yum: name=openstack-ceilometer-compute state=removed
+              package: name=openstack-ceilometer-compute state=removed
              ignore_errors: True
              when: remove_ceilometer_compute_polling_package|bool
            - name: Remove openstack-ceilometer-polling package if operator requests it
-              yum: name=openstack-ceilometer-polling state=removed
+              package: name=openstack-ceilometer-polling state=removed
              ignore_errors: True
              when: remove_ceilometer_compute_polling_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@ -155,7 +155,7 @@ outputs:
              set_fact:
                remove_ceilometer_ipmi_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ceilometer-ipmi package if operator requests it
-              yum: name=openstack-ceilometer-ipmi state=removed
+              package: name=openstack-ceilometer-ipmi state=removed
              ignore_errors: True
              when: remove_ceilometer_ipmi_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@ -165,7 +165,7 @@ outputs:
              set_fact:
                remove_ceilometer_notification_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ceilometer-notification package if operator requests it
-              yum: name=openstack-ceilometer-notification state=removed
+              package: name=openstack-ceilometer-notification state=removed
              ignore_errors: True
              when: remove_ceilometer_notification_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@ -251,7 +251,7 @@ outputs:
              set_fact:
                remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove httpd package if operator requests it
-              yum: name=httpd state=removed
+              package: name=httpd state=removed
              ignore_errors: True
              when: remove_httpd_package|bool
      fast_forward_upgrade_tasks:
@ -291,7 +291,9 @@ outputs:
            - release == 'pike'
            - is_bootstrap_node|bool
        - name: Cinder package update
-          shell: yum -y update openstack-cinder*
+          package:
+            name: 'openstack-cinder*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@ -189,6 +189,6 @@ outputs:
              set_fact:
                remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-cinder package if operator requests it
-              yum: name=openstack-cinder state=removed
+              package: name=openstack-cinder state=removed
              ignore_errors: True
              when: remove_cinder_package|bool
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@ -168,7 +168,7 @@ outputs:
              set_fact:
                remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-cinder package if operator requests it
-              yum: name=openstack-cinder state=removed
+              package: name=openstack-cinder state=removed
              ignore_errors: True
              when: remove_cinder_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@ -248,7 +248,7 @@ outputs:
              set_fact:
                remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-cinder package if operator requests it
-              yum: name=openstack-cinder state=removed
+              package: name=openstack-cinder state=removed
              ignore_errors: True
              when: remove_cinder_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@ -149,7 +149,7 @@ outputs:
              set_fact:
                remove_collectd_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove collectd package if operator requests it
-              yum: name=collectd state=removed
+              package: name=collectd state=removed
              ignore_errors: True
              when: remove_collectd_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@ -173,6 +173,6 @@ outputs:
              set_fact:
                remove_congress_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-congress package if operator requests it
-              yum: name=openstack-congress state=removed
+              package: name=openstack-congress state=removed
              ignore_errors: True
              when: remove_congress_package|bool
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@ -256,7 +256,7 @@ outputs:
              set_fact:
                remove_glance_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-glance package if operator requests it
-              yum: name=openstack-glance state=removed
+              package: name=openstack-glance state=removed
              ignore_errors: True
              when: remove_glance_package|bool
      metadata_settings:
@ -282,7 +282,7 @@ outputs:
            - release == 'ocata'
            - glance_api_enabled|bool
        - name: glance package update
-          yum: name=openstack-glance state=latest
+          package: name=openstack-glance state=latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@ -348,7 +348,7 @@ outputs:
            - httpd_running|bool
          service: name=httpd state=stopped enabled=no
        - name: Update gnocchi packages
-          yum: name={{ item }} state=latest
+          package: name={{ item }} state=latest
          # (pradk): We have to explicitly update numpy as its obsoleted
          # by python2-numpy.
          with_items:
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@ -252,7 +252,9 @@ outputs:
            - release == 'ocata'
            - heat_api_enabled|bool
        - name: FFU Heat package update
-          shell: yum -y update openstack-heat*
+          package:
+            name: 'openstack-heat*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@ -207,7 +207,7 @@ outputs:
              set_fact:
                remove_ironic_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ironic-api package if operator requests it
-              yum: name=openstack-ironic-api state=removed
+              package: name=openstack-ironic-api state=removed
              ignore_errors: True
              when: remove_ironic_api_package|bool
      fast_forward_upgrade_tasks:
@ -229,7 +229,9 @@ outputs:
            - release == 'ocata'
            - ironic_api_enabled|bool
        - name: Ironic package update
-          shell: yum -y update openstack-ironic*
+          package:
+            name: 'openstack-ironic*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@ -240,7 +240,7 @@ outputs:
              set_fact:
                remove_ironic_conductor_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ironic-conductor package if operator requests it
-              yum: name=openstack-ironic-conductor state=removed
+              package: name=openstack-ironic-conductor state=removed
              ignore_errors: True
              when: remove_ironic_conductor_package|bool
      fast_forward_upgrade_tasks:
@ -262,7 +262,9 @@ outputs:
            - release == 'ocata'
            - ironic_conductor_enabled|bool
        - name: Ironic packages update
-          shell: yum -y update openstack-ironic*
+          package:
+            name: 'openstack-ironic*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/ironic-inspector.yaml
+++ b/docker/services/ironic-inspector.yaml
@ -253,6 +253,6 @@ outputs:
              set_fact:
                remove_ironic_inspector_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-ironic-inspector package if operator requests it
-              yum: name=openstack-ironic-inspector state=removed
+              package: name=openstack-ironic-inspector state=removed
              ignore_errors: True
              when: remove_ironic_inspector_package|bool
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@ -263,7 +263,7 @@ outputs:
              set_fact:
                remove_keystone_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-keystone package if operator requests it
-              yum: name=openstack-keystone state=removed
+              package: name=openstack-keystone state=removed
              ignore_errors: True
              when: remove_keystone_package|bool
      metadata_settings:
@ -306,7 +306,9 @@ outputs:
            - keystone_httpd_enabled|bool
            - httpd_running|bool
        - name: Keystone package update
-          shell: yum -y update openstack-keystone*
+          package:
+            name: 'openstack-keystone*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@ -215,6 +215,6 @@ outputs:
              set_fact:
                remove_mistral_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-mistral-api package if operator requests it
-              yum: name=openstack-mistral-api state=removed
+              package: name=openstack-mistral-api state=removed
              ignore_errors: True
              when: remove_mistral_api_package|bool
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@ -150,6 +150,6 @@ outputs:
              set_fact:
                remove_mistral_engine_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-mistral-engine package if operator requests it
-              yum: name=openstack-mistral-engine state=removed
+              package: name=openstack-mistral-engine state=removed
              ignore_errors: True
              when: remove_mistral_engine_package|bool
--- a/docker/services/mistral-event-engine.yaml
+++ b/docker/services/mistral-event-engine.yaml
@ -150,6 +150,6 @@ outputs:
              set_fact:
                remove_mistral_event_engine_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-mistral-event-engine package if operator requests it
-              yum: name=openstack-mistral-event-engine state=removed
+              package: name=openstack-mistral-event-engine state=removed
              ignore_errors: True
              when: remove_mistral_event_engine_package|bool
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@ -166,6 +166,6 @@ outputs:
              set_fact:
                remove_mistral_executor_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-mistral-executor package if operator requests it
-              yum: name=openstack-mistral-executor state=removed
+              package: name=openstack-mistral-executor state=removed
              ignore_errors: True
              when: remove_mistral_executor_package|bool
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@ -226,7 +226,7 @@ outputs:
              set_fact:
                remove_neutron_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-neutron package if operator requests it
-              yum: name=openstack-neutron state=removed
+              package: name=openstack-neutron state=removed
              ignore_errors: True
              when: remove_neutron_package|bool
      metadata_settings:
@ -252,12 +252,14 @@ outputs:
            - release == 'ocata'
            - neutron_server_enabled|bool
        - name: Neutron package update
-          shell: yum -y update openstack-neutron*
+          package:
+            name: 'openstack-neutron*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
        - name: Neutron package update workaround
-          yum: name=python-networking-odl state=latest
+          package: name=python-networking-odl state=latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@ -210,7 +210,7 @@ outputs:
                  set_fact:
                    remove_neutron_openvswitch_package: {get_param: UpgradeRemoveUnusedPackages}
                - name: Remove openstack-neutron-openvswitch package if operator requests it
-                  yum: name=openstack-neutron-openvswitch state=removed
+                  package: name=openstack-neutron-openvswitch state=removed
                  ignore_errors: True
                  when: remove_neutron_openvswitch_package|bool
      update_tasks:
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@ -378,7 +378,7 @@ outputs:
              set_fact:
                remove_nova_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-api package if operator requests it
-              yum: name=openstack-nova-api state=removed
+              package: name=openstack-nova-api state=removed
              ignore_errors: True
              when:
                - remove_nova_api_package|bool
@ -413,7 +413,9 @@ outputs:
            - release == 'ocata'
            - is_bootstrap_node|bool
        - name: Update nova packages
-          command: yum update -y *nova*
+          package:
+            name: '*nova*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@ -303,7 +303,7 @@ outputs:
              set_fact:
                remove_nova_compute_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-compute package if operator requests it
-              yum: name=openstack-nova-compute state=removed
+              package: name=openstack-nova-compute state=removed
              ignore_errors: True
              when: remove_nova_compute_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@ -173,7 +173,7 @@ outputs:
              set_fact:
                remove_nova_conductor_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-conductor package if operator requests it
-              yum: name=openstack-nova-conductor state=removed
+              package: name=openstack-nova-conductor state=removed
              ignore_errors: True
              when: remove_nova_conductor_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/nova-consoleauth.yaml
+++ b/docker/services/nova-consoleauth.yaml
@ -160,7 +160,7 @@ outputs:
              set_fact:
                remove_nova_console_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-console package if operator requests it
-              yum: name=openstack-nova-console state=removed
+              package: name=openstack-nova-console state=removed
              ignore_errors: True
              when: remove_nova_console_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@ -181,7 +181,7 @@ outputs:
              set_fact:
                remove_nova_compute_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-compute package if operator requests it
-              yum: name=openstack-nova-compute state=removed
+              package: name=openstack-nova-compute state=removed
              ignore_errors: True
              when: remove_nova_compute_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@ -188,6 +188,6 @@ outputs:
              set_fact:
                remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove httpd package if operator requests it
-              yum: name=httpd state=removed
+              package: name=httpd state=removed
              ignore_errors: True
              when: remove_httpd_package|bool
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@ -161,7 +161,7 @@ outputs:
              set_fact:
                remove_nova_scheduler_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-scheduler package if operator requests it
-              yum: name=openstack-nova-scheduler state=removed
+              package: name=openstack-nova-scheduler state=removed
              ignore_errors: True
              when: remove_nova_scheduler_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/docker/services/nova-vnc-proxy.yaml
@ -217,7 +217,7 @@ outputs:
              set_fact:
                remove_nova_novncproxy_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-nova-novncproxy package if operator requests it
-              yum: name=openstack-nova-novncproxy state=removed
+              package: name=openstack-nova-novncproxy state=removed
              ignore_errors: True
              when: remove_nova_novncproxy_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@ -162,6 +162,6 @@ outputs:
              set_fact:
                remove_octavia_health_manager_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-octavia-health-manager package if operator requests it
-              yum: name=openstack-octavia-health-manager state=removed
+              package: name=openstack-octavia-health-manager state=removed
              ignore_errors: True
              when: remove_octavia_health_manager_package|bool
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@ -149,7 +149,7 @@ outputs:
              /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
          ignore_errors: true
        - name: Ensure packages required for configuring octavia are present
-          yum: name={{item}}  state=present
+          package: name={{item}}  state=present
          with_items:
            - python2-neutronclient
            - python2-openstackclient
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@ -475,7 +475,7 @@ outputs:
            # guarantee that ownership is fixed at the end of step 3
            - name: Update host mariadb packages
              when: step|int == 3
-              yum: name=mariadb-server-galera state=latest
+              package: name=mariadb-server-galera state=latest
            - name: Mysql upgrade script
              set_fact:
                mysql_upgrade_script:
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@ -182,7 +182,7 @@ outputs:
              set_fact:
                remove_sahara_api_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-sahara-api package if operator requests it
-              yum: name=openstack-sahara-api state=removed
+              package: name=openstack-sahara-api state=removed
              ignore_errors: True
              when: remove_sahara_api_package|bool
      fast_forward_upgrade_tasks:
@ -206,7 +206,9 @@ outputs:
            - release == 'ocata'
            - sahara_api_enabled|bool
        - name: FFU Sahara package update
-          shell: yum -y update openstack-sahara*
+          package:
+            name: 'openstack-sahara*'
+            state: latest
          when:
            - step|int == 6
            - is_bootstrap_node|bool
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@ -167,7 +167,7 @@ outputs:
              set_fact:
                remove_sahara_engine_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-sahara-engine package if operator requests it
-              yum: name=openstack-sahara-engine state=removed
+              package: name=openstack-sahara-engine state=removed
              ignore_errors: True
              when: remove_sahara_engine_package|bool
      fast_forward_upgrade_tasks:
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@ -284,7 +284,7 @@ outputs:
              set_fact:
                remove_swift_proxy_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-swift-proxy package if operator requests it
-              yum: name=openstack-swift-proxy state=removed
+              package: name=openstack-swift-proxy state=removed
              ignore_errors: True
              when: remove_swift_proxy_package|bool
      metadata_settings:
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@ -531,7 +531,7 @@ outputs:
              set_fact:
                remove_swift_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-swift-container,object,account packages if operator requests it
-              yum: name={{ item }} state=removed
+              package: name={{ item }} state=removed
              ignore_errors: True
              when: remove_swift_package|bool
              with_items:
--- a/docker/services/tripleo-ui.yaml
+++ b/docker/services/tripleo-ui.yaml
@ -157,7 +157,7 @@ outputs:
                - httpd_running|bool
              service: name=httpd state=stopped enabled=no
            - name: Remove openstack-tripleo-ui package if operator requests it
-              yum: name=openstack-tripleo-ui state=removed
+              package: name=openstack-tripleo-ui state=removed
              ignore_errors: True
              when: {get_param: UpgradeRemoveUnusedPackages}
      metadata_settings:
--- a/docker/services/undercloud-upgrade.yaml
+++ b/docker/services/undercloud-upgrade.yaml
@ -46,7 +46,7 @@ outputs:
        config_image: ''
      upgrade_tasks:
        - name: upgrade all packages
-          yum:
+          package:
            name: '*'
            state: latest
          when: step|int == 3
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@ -233,7 +233,7 @@ outputs:
              set_fact:
                remove_zaqar_package: {get_param: UpgradeRemoveUnusedPackages}
            - name: Remove openstack-zaqar package if operator requests it
-              yum: name=openstack-zaqar state=removed
+              package: name=openstack-zaqar state=removed
              ignore_errors: True
              when: remove_zaqar_package|bool
      metadata_settings:
--- a/puppet/services/aide.yaml
+++ b/puppet/services/aide.yaml
@ -86,7 +86,7 @@ outputs:
      upgrade_tasks:
       - name: Ensure Aide is installed
         when: step|int == 4
-         yum: name=aide state=latest
+         package: name=aide state=latest
       - name: re-init database
         when: step|int == 5
         shell: aide --init --config $(hiera tripleo::profile::base::aide::aide_conf_path)
--- a/puppet/services/apache.j2.yaml
+++ b/puppet/services/apache.j2.yaml
@ -150,5 +150,5 @@ outputs:
        - when: step|int == 3
          block:
            - name: Ensure mod_ssl package is installed
-              yum: name=mod_ssl state=latest
+              package: name=mod_ssl state=latest
 {% endraw %}
--- a/puppet/services/barbican-api.yaml
+++ b/puppet/services/barbican-api.yaml
@ -221,7 +221,7 @@ outputs:
                - barbican_api_enabled.rc == 0
              tags: validation
            - name: Install openstack-barbican-api package if it was disabled
-              yum: name=openstack-barbican-api state=latest
+              package: name=openstack-barbican-api state=latest
              when:
                - step|int == 3
                - barbican_api_enabled.rc != 0
--- a/puppet/services/ceilometer-agent-ipmi.yaml
+++ b/puppet/services/ceilometer-agent-ipmi.yaml
@ -93,7 +93,7 @@ outputs:
            - ceilometer_ipmi_enabled.rc == 0
          service: name=openstack-ceilometer-ipmi state=stopped
        - name: Install openstack-ceilometer-ipmi package if it was disabled
-          yum: name=openstack-ceilometer-ipmi state=latest
+          package: name=openstack-ceilometer-ipmi state=latest
          when:
            - step|int == 3
            - ceilometer_ipmi_enabled.rc != 0
--- a/puppet/services/congress.yaml
+++ b/puppet/services/congress.yaml
@ -169,7 +169,7 @@ outputs:
            - congress_enabled.rc == 0
          service: name=openstack-congress-server state=stopped
        - name: Install openstack-congress package if it was disabled
-          yum: name=openstack-congress state=latest
+          package: name=openstack-congress state=latest
          when:
            - step|int == 3
            - congress_enabled.rc != 0
--- a/puppet/services/database/redis.yaml
+++ b/puppet/services/database/redis.yaml
@ -122,7 +122,7 @@ outputs:
            - redis_enabled.rc == 0
          service: name=redis state=stopped
        - name: Install redis package if it was disabled
-          yum: name=redis state=latest
+          package: name=redis state=latest
          when:
            - step|int == 3
            - redis_enabled.rc != 0
--- a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
+++ b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
@ -68,7 +68,7 @@ outputs:
            - release == 'ocata'
            - heat_api_cloudwatch_enabled|bool
        - name: Remove heat_api_cloudwatch package
-          yum: name=openstack-heat-api-cloudwatch state=removed
+          package: name=openstack-heat-api-cloudwatch state=removed
          ignore_errors: True
          when:
            - step|int == 2
--- a/puppet/services/docker-registry.j2.yaml
+++ b/puppet/services/docker-registry.j2.yaml
@ -110,4 +110,4 @@ outputs:
      upgrade_tasks:
        - name: Install docker packages on upgrade if missing
          when: step|int == 3
-          yum: name=docker-distribution state=latest
+          package: name=docker-distribution state=latest
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@ -115,7 +115,7 @@ outputs:
      upgrade_tasks:
        - name: Install docker packages on upgrade if missing
          when: step|int == 3
-          yum: name=docker state=latest
+          package: name=docker state=latest
      update_tasks:
        - name: Restart Docker when needed
          when: step|int == 2
--- a/puppet/services/ec2-api.yaml
+++ b/puppet/services/ec2-api.yaml
@ -225,7 +225,7 @@ outputs:
            - ec2_api_enabled.rc == 0
          service: name=openstack-ec2-api state=stopped
        - name: Install openstack-ec2-api package if it was disabled
-          yum: name=openstack-ec2-api state=latest
+          package: name=openstack-ec2-api state=latest
          when:
            - step|int == 3
            - ec2_api_enabled.rc != 0
--- a/puppet/services/logging/fluentd.yaml
+++ b/puppet/services/logging/fluentd.yaml
@ -97,7 +97,7 @@ outputs:
            - fluentd_client_enabled.rc == 0
          service: name=fluentd state=stopped
        - name: Install fluentd package if it was disabled
-          yum: name=fluentd state=latest
+          package: name=fluentd state=latest
          when:
            - step|int == 3
            - fluentd_client_enabled.rc != 0
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@ -325,7 +325,7 @@ outputs:
            - collectd_enabled.rc == 0
          service: name=collectd state=stopped
        - name: Install collectd package if it was disabled
-          yum: name=collectd state=latest
+          package: name=collectd state=latest
          when:
            - step|int == 3
            - collectd_enabled.rc != 0
--- a/puppet/services/mistral-engine.yaml
+++ b/puppet/services/mistral-engine.yaml
@ -94,7 +94,7 @@ outputs:
          when: step|int == 1
          service: name=openstack-mistral-engine state=stopped
        - name: Install openstack-mistral-engine package if it was disabled
-          yum: name=openstack-mistral-engine state=latest
+          package: name=openstack-mistral-engine state=latest
          when:
            - step|int == 3
            - mistral_engine_enabled.rc != 0
--- a/puppet/services/mistral-event-engine.yaml
+++ b/puppet/services/mistral-event-engine.yaml
@ -69,7 +69,7 @@ outputs:
          when: step|int == 1
          service: name=openstack-mistral-event-engine state=stopped
        - name: Install openstack-mistral-event-engine package if it was disabled
-          yum: name=openstack-mistral-event-engine state=latest
+          package: name=openstack-mistral-event-engine state=latest
          when:
            - step|int == 3
            - mistral_event_engine_enabled.rc != 0
--- a/puppet/services/mistral-executor.yaml
+++ b/puppet/services/mistral-executor.yaml
@ -75,7 +75,7 @@ outputs:
          when: step|int == 1
          service: name=openstack-mistral-executor state=stopped
        - name: Install openstack-mistral-executor package if it was disabled
-          yum: name=openstack-mistral-executor state=latest
+          package: name=openstack-mistral-executor state=latest
          when:
            - step|int == 3
            - mistral_executor_enabled.rc != 0
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@ -98,7 +98,7 @@ outputs:
            - sensu_client_enabled.rc == 0
          service: name=sensu-client state=stopped
        - name: Install sensu package if it was disabled
-          yum: name=sensu state=latest
+          package: name=sensu state=latest
          when:
            - step|int == 3
            - sensu_client_enabled.rc != 0
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@ -306,7 +306,7 @@ outputs:
                LEVEL: {get_param: UpgradeLevelNovaCompute}
        - name: install openstack-nova-migration
          when: step|int == 3
-          yum: name=openstack-nova-migration state=latest
+          package: name=openstack-nova-migration state=latest
        - name: Start nova-compute service
          when: step|int == 6
          service: name=openstack-nova-compute state=started
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@ -156,4 +156,4 @@ outputs:
        # it on upgrade
        - name: Install nova-placement packages on upgrade
          when: step|int == 3
-          yum: name=openstack-nova-placement-api state=latest
+          package: name=openstack-nova-placement-api state=latest
--- a/puppet/services/panko-api.yaml
+++ b/puppet/services/panko-api.yaml
@ -145,4 +145,4 @@ outputs:
                - httpd_enabled.rc == 0
            - name: Install openstack-panko-api package if it was not installed
              when: step|int == 3
-              yum: name=openstack-panko-api state=latest
+              package: name=openstack-panko-api state=latest
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@ -168,7 +168,7 @@ outputs:
            - tacker_enabled.rc == 0
          service: name=openstack-tacker-server state=stopped
        - name: Install openstack-tacker package if it was disabled
-          yum: name=openstack-tacker state=latest
+          package: name=openstack-tacker state=latest
          when:
            - step|int == 3
            - tacker_enabled.rc != 0
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@ -64,7 +64,7 @@ outputs:
      upgrade_tasks:
        - name: Check yum for rpm-python present
          when: step|int == 0
-          yum: "name=rpm-python state=present"
+          package: "name=rpm-python state=present"
          register: rpm_python_check
        - name: Fail when rpm-python wasn't present
          fail: msg="rpm-python package was not present before this run! Check environment before re-running"
@ -82,7 +82,7 @@ outputs:
          when: step|int == 3
        - block:
            - name: Upgrade os-net-config
-              yum: name=os-net-config state=latest
+              package: name=os-net-config state=latest
            - name: take new os-net-config parameters into account now
              command: os-net-config --no-activate -c /etc/os-net-config/config.json -v --detailed-exit-codes
              register: os_net_config_upgrade
@ -94,7 +94,7 @@ outputs:
            - os_net_config_has_config.rc == 0
        - name: Update all packages
          when: step|int == 3
-          yum: name=* state=latest
+          package: name=* state=latest
      update_tasks:
        - name: Check for existing yum.pid
          stat:  path=/var/run/yum.pid
@ -104,7 +104,7 @@ outputs:
          fail: msg="ERROR existing yum.pid detected - can't continue! Please ensure there is no other package update process for the duration of the minor update worfklow. Exiting."
          when: (step|int == 0 or step|int == 3) and yum_pid_file.stat.exists
        - name: Update all packages
-          yum: name=* state=latest update_cache=yes  # cache for tripleo/+bug/1703830
+          package: name=* state=latest update_cache=yes  # cache for tripleo/+bug/1703830
          when: step == "3"
      fast_forward_upgrade_tasks:
        - name: Register repo type and args
--- a/puppet/services/zaqar-api.yaml
+++ b/puppet/services/zaqar-api.yaml
@ -255,7 +255,7 @@ outputs:
                - zaqar_enabled.rc == 0
              service: name=openstack-zaqar state=stopped enabled=no
            - name: Install openstack-zaqar package if it was disabled
-              yum: name=openstack-zaqar state=latest
+              package: name=openstack-zaqar state=latest
              when:
                - step|int == 3
                - zaqar_enabled.rc != 0