From b3a7cfc43ff816cc64867d1c7ff112d0c5787e8f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 20 Jul 2018 14:03:57 -0400 Subject: [PATCH] ansible: replace yum module by package module when possible Problem: RHEL and CentOS8 will deprecate the usage of Yum. From DNF release note: DNF is the next upcoming major version of yum, a package manager for RPM-based Linux distributions. It roughly maintains CLI compatibility with YUM and defines a strict API for extensions. Solution: Use "package" Ansible module instead of "yum". "package" module is smarter when it comes to detect with package manager runs on the system. The goal of this patch is to support both yum/dnf (dnf will be the default in rhel/centos 8) from a single ansible module. Change-Id: I8e67d6f053e8790fdd0eb52a42035dca3051999e --- common/deploy-steps.j2 | 4 ++-- docker/services/aodh-api.yaml | 6 ++++-- docker/services/aodh-evaluator.yaml | 2 +- docker/services/aodh-listener.yaml | 2 +- docker/services/aodh-notifier.yaml | 2 +- docker/services/barbican-api.yaml | 2 +- docker/services/ceilometer-agent-central.yaml | 2 +- docker/services/ceilometer-agent-compute.yaml | 4 ++-- docker/services/ceilometer-agent-ipmi.yaml | 2 +- docker/services/ceilometer-agent-notification.yaml | 2 +- docker/services/cinder-api.yaml | 6 ++++-- docker/services/cinder-backup.yaml | 2 +- docker/services/cinder-scheduler.yaml | 2 +- docker/services/cinder-volume.yaml | 2 +- docker/services/collectd.yaml | 2 +- docker/services/congress.yaml | 2 +- docker/services/glance-api.yaml | 4 ++-- docker/services/gnocchi-api.yaml | 2 +- docker/services/heat-api.yaml | 4 +++- docker/services/ironic-api.yaml | 6 ++++-- docker/services/ironic-conductor.yaml | 6 ++++-- docker/services/ironic-inspector.yaml | 2 +- docker/services/keystone.yaml | 6 ++++-- docker/services/mistral-api.yaml | 2 +- docker/services/mistral-engine.yaml | 2 +- docker/services/mistral-event-engine.yaml | 2 +- docker/services/mistral-executor.yaml | 2 +- docker/services/neutron-api.yaml | 8 +++++--- docker/services/neutron-ovs-agent.yaml | 2 +- docker/services/nova-api.yaml | 6 ++++-- docker/services/nova-compute.yaml | 2 +- docker/services/nova-conductor.yaml | 2 +- docker/services/nova-consoleauth.yaml | 2 +- docker/services/nova-ironic.yaml | 2 +- docker/services/nova-placement.yaml | 2 +- docker/services/nova-scheduler.yaml | 2 +- docker/services/nova-vnc-proxy.yaml | 2 +- docker/services/octavia-health-manager.yaml | 2 +- docker/services/octavia-worker.yaml | 2 +- docker/services/pacemaker/database/mysql.yaml | 2 +- docker/services/sahara-api.yaml | 6 ++++-- docker/services/sahara-engine.yaml | 2 +- docker/services/swift-proxy.yaml | 2 +- docker/services/swift-storage.yaml | 2 +- docker/services/tripleo-ui.yaml | 2 +- docker/services/undercloud-upgrade.yaml | 2 +- docker/services/zaqar.yaml | 2 +- puppet/services/aide.yaml | 2 +- puppet/services/apache.j2.yaml | 2 +- puppet/services/barbican-api.yaml | 2 +- puppet/services/ceilometer-agent-ipmi.yaml | 2 +- puppet/services/congress.yaml | 2 +- puppet/services/database/redis.yaml | 2 +- .../services/disabled/heat-api-cloudwatch-disabled.yaml | 2 +- puppet/services/docker-registry.j2.yaml | 2 +- puppet/services/docker.yaml | 2 +- puppet/services/ec2-api.yaml | 2 +- puppet/services/logging/fluentd.yaml | 2 +- puppet/services/metrics/collectd.yaml | 2 +- puppet/services/mistral-engine.yaml | 2 +- puppet/services/mistral-event-engine.yaml | 2 +- puppet/services/mistral-executor.yaml | 2 +- puppet/services/monitoring/sensu-client.yaml | 2 +- puppet/services/nova-compute.yaml | 2 +- puppet/services/nova-placement.yaml | 2 +- puppet/services/panko-api.yaml | 2 +- puppet/services/tacker.yaml | 2 +- puppet/services/tripleo-packages.yaml | 8 ++++---- puppet/services/zaqar-api.yaml | 2 +- 69 files changed, 102 insertions(+), 84 deletions(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 95e0a3a4b9..60c4c84916 100644 --- 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: | diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml index 8717ef9cb2..0fe9566d30 100644 --- 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 diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index b5d32e3805..ba8d4cf4cf 100644 --- 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: diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index 37f4126377..ffb5b18da6 100644 --- 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: diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index 689f7bc785..e9ae15bd9f 100644 --- 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: diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index 92fc7dc8ad..b6e8c12d4c 100644 --- 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: diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index a5beb52748..0fe5cf7d07 100644 --- 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: diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index 08ed39e703..c68b01489d 100644 --- 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: diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index 851f8df5e2..5ab0027fce 100644 --- 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: diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 6301b2bed7..25bd7ae008 100644 --- 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: diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 5d4dde5529..0f7767fc86 100644 --- 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 diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index f9ca3adb31..0e5f0c5abb 100644 --- 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 diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index ba935ae05f..42f998f953 100644 --- 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: diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index c06d9df11c..3f4f0afe81 100644 --- 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: diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml index c843f32e30..ca8f1472db 100644 --- 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: diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index 30eaba00ce..7cfb01d7a9 100644 --- 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 diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 5fed2e34ac..f00738d7ac 100644 --- 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 diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index 79fd4bc89e..4209b6b7bf 100644 --- 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: diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 4794c18bbc..b35fbbe5ee 100644 --- 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 diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml index f413d3683c..c12d5c439c 100644 --- 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 diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 991a3ea4f9..a24fc6eb30 100644 --- 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 diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml index c77a57f91f..e77e3ae377 100644 --- 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 diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 02c57b85be..cb753be87a 100644 --- 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 diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index 5a4045c1c4..1d6e3ce440 100644 --- 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 diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index 3536abb39a..ad43d16367 100644 --- 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 diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml index 2f44f267bd..0c3e90e1b6 100644 --- 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 diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index 1b3400f68a..0bb81f35f9 100644 --- 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 diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 879195a1b2..7fe3064683 100644 --- 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 diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 0dfba6f160..4d0df182ee 100644 --- 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: diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index f8f4973f35..192fd8c145 100644 --- 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 diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 035f31f841..83d8ec88b0 100644 --- 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: diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 18fcb1bd86..19f25d09ef 100644 --- 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: diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 13a0f2d08f..e43310f9e1 100644 --- 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: diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 9949433caa..9a56c364d8 100644 --- 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: diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 3fdebefab4..f6b849c840 100644 --- 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 diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 0d8b04823a..682aae7881 100644 --- 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: diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index bc4935701f..ef72abcfac 100644 --- 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: diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 54246f9572..4fd82ce4bf 100644 --- 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 diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index 01b087982f..c567982698 100644 --- 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 diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml index 642ca16a00..49642ded30 100644 --- 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: diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml index 0c13514ac3..bbabc79260 100644 --- 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 diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index 1e7096e57b..cabdd13ae7 100644 --- 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: diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index d2e9b10f44..904d81f91f 100644 --- 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: diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 016da9035c..f9cb04b7d4 100644 --- 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: diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml index f4cfc804ed..3e6425c50d 100644 --- 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: diff --git a/docker/services/undercloud-upgrade.yaml b/docker/services/undercloud-upgrade.yaml index 49c9f8cb5b..40ddbbfcb7 100644 --- 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 diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index a5645b474d..94247339db 100644 --- 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: diff --git a/puppet/services/aide.yaml b/puppet/services/aide.yaml index dbd952070c..e650ca19a9 100644 --- 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) diff --git a/puppet/services/apache.j2.yaml b/puppet/services/apache.j2.yaml index 7b2741866f..38d3336bda 100644 --- 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 %} diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index 0cca750ea4..fc51144f02 100644 --- 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 diff --git a/puppet/services/ceilometer-agent-ipmi.yaml b/puppet/services/ceilometer-agent-ipmi.yaml index ea27de7580..9edf9908ea 100644 --- 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 diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index 55c43c5906..682e8dee63 100644 --- 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 diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml index e68c1deeff..9dc51e8ba4 100644 --- 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 diff --git a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml index 9cc1a54125..8c17626a25 100644 --- 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 diff --git a/puppet/services/docker-registry.j2.yaml b/puppet/services/docker-registry.j2.yaml index bcc1e420b9..5ee09fbf0b 100644 --- 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 diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml index d773c29c2c..1d2968661f 100644 --- 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 diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 36ebfa796e..c9988e5310 100644 --- 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 diff --git a/puppet/services/logging/fluentd.yaml b/puppet/services/logging/fluentd.yaml index 3aa77c0814..78e3a4484f 100644 --- 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 diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml index 1ea720c2a2..b90250e9bb 100644 --- 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 diff --git a/puppet/services/mistral-engine.yaml b/puppet/services/mistral-engine.yaml index cc92fc7593..34140a8289 100644 --- 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 diff --git a/puppet/services/mistral-event-engine.yaml b/puppet/services/mistral-event-engine.yaml index 53f4abd3d9..ef7ab7d5c8 100644 --- 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 diff --git a/puppet/services/mistral-executor.yaml b/puppet/services/mistral-executor.yaml index f7232ab0be..a949a8cba2 100644 --- 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 diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml index f83501789c..8c8a060d83 100644 --- 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 diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index bedef486b8..2cc37e1838 100644 --- 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 diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml index 29a37c5a33..69f707c429 100644 --- 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 diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index 4e2a267fa2..b19afd7671 100644 --- 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 diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index 2b08e0dfac..f4f5b48989 100644 --- 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 diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index f817eecc31..9d8cac7a11 100644 --- 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 diff --git a/puppet/services/zaqar-api.yaml b/puppet/services/zaqar-api.yaml index a8e83f9b79..6495c6b752 100644 --- 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