openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Emilien Macchi 2018-07-20 14:03:57 -04:00 committed by Evilien Macchi
parent 64f13f47da
commit b3a7cfc43f
69 changed files with 102 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/deploy-steps.j2
View File

@ -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: |

6
docker/services/aodh-api.yaml
View File

@ -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

2
docker/services/aodh-evaluator.yaml
View File

@ -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:

2
docker/services/aodh-listener.yaml
View File

@ -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:

2
docker/services/aodh-notifier.yaml
View File

@ -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:

2
docker/services/barbican-api.yaml
View File

@ -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:

2
docker/services/ceilometer-agent-central.yaml
View File

@ -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:

4
docker/services/ceilometer-agent-compute.yaml
View File

@ -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:

2
docker/services/ceilometer-agent-ipmi.yaml
View File

@ -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:

2
docker/services/ceilometer-agent-notification.yaml
View File

@ -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:

6
docker/services/cinder-api.yaml
View File

@ -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

2
docker/services/cinder-backup.yaml
View File

@ -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

2
docker/services/cinder-scheduler.yaml
View File

@ -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:

2
docker/services/cinder-volume.yaml
View File

@ -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:

2
docker/services/collectd.yaml
View File

@ -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:

2
docker/services/congress.yaml
View File

@ -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

4
docker/services/glance-api.yaml
View File

@ -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

2
docker/services/gnocchi-api.yaml
View File

@ -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:

4
docker/services/heat-api.yaml
View File

@ -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

6
docker/services/ironic-api.yaml
View File

@ -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

6
docker/services/ironic-conductor.yaml
View File

@ -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

2
docker/services/ironic-inspector.yaml
View File

@ -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

6
docker/services/keystone.yaml
View File

@ -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

2
docker/services/mistral-api.yaml
View File

@ -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

2
docker/services/mistral-engine.yaml
View File

@ -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

2
docker/services/mistral-event-engine.yaml
View File

@ -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

2
docker/services/mistral-executor.yaml
View File

@ -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

8
docker/services/neutron-api.yaml
View File

@ -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

2
docker/services/neutron-ovs-agent.yaml
View File

@ -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:

6
docker/services/nova-api.yaml
View File

@ -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

2
docker/services/nova-compute.yaml
View File

@ -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:

2
docker/services/nova-conductor.yaml
View File

@ -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:

2
docker/services/nova-consoleauth.yaml
View File

@ -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:

2
docker/services/nova-ironic.yaml
View File

@ -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:

2
docker/services/nova-placement.yaml
View File

@ -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

2
docker/services/nova-scheduler.yaml
View File

@ -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:

2
docker/services/nova-vnc-proxy.yaml
View File

@ -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:

2
docker/services/octavia-health-manager.yaml
View File

@ -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

2
docker/services/octavia-worker.yaml
View File

@ -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

2
docker/services/pacemaker/database/mysql.yaml
View File

@ -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:

6
docker/services/sahara-api.yaml
View File

@ -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

2
docker/services/sahara-engine.yaml
View File

@ -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:

2
docker/services/swift-proxy.yaml
View File

@ -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:

2
docker/services/swift-storage.yaml
View File

@ -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:

2
docker/services/tripleo-ui.yaml
View File

@ -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:

2
docker/services/undercloud-upgrade.yaml
View File

@ -46,7 +46,7 @@ outputs:
config_image: ''
upgrade_tasks:
- name: upgrade all packages
yum:
package:
name: '*'
state: latest
when: step|int == 3

2
docker/services/zaqar.yaml
View File

@ -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:

2
puppet/services/aide.yaml
View File

@ -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)

2
puppet/services/apache.j2.yaml
View File

@ -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 %}

2
puppet/services/barbican-api.yaml
View File

@ -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

2
puppet/services/ceilometer-agent-ipmi.yaml
View File

@ -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

2
puppet/services/congress.yaml
View File

@ -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

2
puppet/services/database/redis.yaml
View File

@ -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

2
puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
View File

@ -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

2
puppet/services/docker-registry.j2.yaml
View File

@ -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

2
puppet/services/docker.yaml
View File

@ -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

2
puppet/services/ec2-api.yaml
View File

@ -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

2
puppet/services/logging/fluentd.yaml
View File

@ -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

2
puppet/services/metrics/collectd.yaml
View File

@ -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

2
puppet/services/mistral-engine.yaml
View File

@ -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

2
puppet/services/mistral-event-engine.yaml
View File

@ -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

2
puppet/services/mistral-executor.yaml
View File

@ -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

2
puppet/services/monitoring/sensu-client.yaml
View File

@ -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

2
puppet/services/nova-compute.yaml
View File

@ -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

2
puppet/services/nova-placement.yaml
View File

@ -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

2
puppet/services/panko-api.yaml
View File

@ -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

2
puppet/services/tacker.yaml
View File

@ -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

8
puppet/services/tripleo-packages.yaml
View File

@ -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

2
puppet/services/zaqar-api.yaml
View File

@ -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