openstack/tripleo-heat-templates
Code Issues Proposed changes

Convert tags to when statements for Q major upgrade workflow

Browse Source 
This converts "tags: stepN" to "when: step|int == N" for the direct
execution as an ansible playbook, with a loop variable 'step'.
The tasks all include the explicit cast |int.

This also adds a set_fact task for handling of the package removal
with the UpgradeRemovePackages parameter (no change to the interface)

The yaml-validate also now checks for duplicate 'when:' statements

Q upgrade spec @ Ibde21e6efae3a7d311bee526d63c5692c4e27b28
Related Blueprint: major-upgrade-workflow
[0]: 394a92f761/tripleo_common/utils/config.py (L141)
Change-Id: I6adc5619a28099f4e241351b63377f1e96933810
This commit is contained in:
marios 2017-10-11 09:51:08 +03:00
parent 587cd86c54
commit dec003def8
169 changed files with 971 additions and 1022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,16 +179,18 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if aodh api is running"
shell: systemctl status 'httpd' | grep -q aodh
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop and disable aodh service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
- name: Set fact for removal of openstack-aodh-api package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_aodh_api_package|bool) and (step|int == 2)
metadata_settings:
get_attr: [AodhApiPuppetBase, role_data, metadata_settings]

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

@ -130,14 +130,16 @@ outputs:
register: aodh_evaluator_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-evaluator is running"
command: systemctl is-active --quiet openstack-aodh-evaluator
when: aodh_evaluator_enabled.rc == 0
tags: step0,validation
when: (aodh_evaluator_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable openstack-aodh-evaluator service
tags: step2
when: aodh_evaluator_enabled.rc == 0
when: (aodh_evaluator_enabled.rc == 0) and (step|int == 2)
service: name=openstack-aodh-evaluator.service state=stopped enabled=no
- name: Set fact for removal of openstack-aodh-evaluator package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_aodh_evaluator_package|bool) and (step|int == 2)

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

@ -130,14 +130,16 @@ outputs:
register: aodh_listener_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running"
command: systemctl is-active --quiet openstack-aodh-listener
when: aodh_listener_enabled.rc == 0
tags: step0,validation
when: (aodh_listener_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable openstack-aodh-listener service
tags: step2
when: aodh_listener_enabled.rc == 0
when: (aodh_listener_enabled.rc == 0) and (step|int == 2)
service: name=openstack-aodh-listener.service state=stopped enabled=no
- name: Set fact for removal of openstack-aodh-listener package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_aodh_listener_package|bool) and (step|int == 2)

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

@ -130,14 +130,16 @@ outputs:
register: aodh_notifier_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-notifier is running"
command: systemctl is-active --quiet openstack-aodh-notifier
when: aodh_notifier_enabled.rc == 0
tags: step0,validation
when: (aodh_notifier_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable openstack-aodh-notifier service
tags: step2
when: aodh_notifier_enabled.rc == 0
service: name=openstack-aodh-notifier state=stopped enabled=no
when: (aodh_notifier_enabled.rc == 0) and (step|int == 2)
service: name=openstack-aodh-notifier.service state=stopped enabled=no
- name: Set fact for removal of openstack-aodh-notifier package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_aodh_notifier_package|bool) and (step|int == 2)

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

@ -214,16 +214,17 @@ outputs:
register: barbican_enabled
- name: "PreUpgrade step0,validation: Check service barbican-api is running"
command: systemctl is-active --quiet openstack-barbican-api
when: barbican_enabled.rc == 0
tags: step0,validation
when: (barbican_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable barbican_api service
tags: step2
when: barbican_enabled.rc == 0
when: (barbican_enabled.rc == 0) and (step|int == 2)
service: name=openstack-barbican-api state=stopped enabled=no
- name: Set fact for removal of openstack-barbican-api package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_barbican_api_package|bool) and (step|int == 2)
metadata_settings:
get_attr: [BarbicanApiBase, role_data, metadata_settings]

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

@ -143,14 +143,16 @@ outputs:
register: ceilometer_agent_central_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
command: systemctl is-active --quiet openstack-ceilometer-central
when: ceilometer_agent_central_enabled.rc == 0
tags: step0,validation
when: (ceilometer_agent_central_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ceilometer agent central service
tags: step2
service: name=openstack-ceilometer-central state=stopped enabled=no
when: ceilometer_agent_central_enabled.rc == 0
when: (ceilometer_agent_central_enabled.rc == 0) and (step|int == 2)
- name: Set fact for removal of openstack-ceilometer-central package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_ceilometer_central_package|bool) and (step|int == 2)

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

@ -122,27 +122,27 @@ outputs:
register: openstack_ceilometer_polling_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
command: systemctl is-active --quiet openstack-ceilometer-compute
when: openstack_ceilometer_compute_enabled.rc == 0
tags: step0,validation
when: (openstack_ceilometer_compute_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-polling is running"
command: systemctl is-active --quiet openstack-ceilometer-polling
when: openstack_ceilometer_polling_enabled.rc == 0
tags: step0,validation
when: (openstack_ceilometer_polling_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ceilometer compute agent
tags: step2
service: name=openstack-ceilometer-compute state=stopped enabled=no
when: openstack_ceilometer_compute_enabled.rc|default('') == 0
when: (openstack_ceilometer_compute_enabled.rc|default('') == 0) and (step|int == 2)
- name: Stop and disable ceilometer polling agent
tags: step2
service: name=openstack-ceilometer-polling state=stopped enabled=no
when: openstack_ceilometer_polling_enabled.rc|default('') == 0
when: (openstack_ceilometer_polling_enabled.rc|default('') == 0) and (step|int == 2)
- name: Set fact for removal of openstack-ceilometer-compute and polling package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_ceilometer_compute_polling_package|bool) and (step|int == 2)
- name: Remove openstack-ceilometer-polling package if operator requests it
yum: name=openstack-ceilometer-polling state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_ceilometer_compute_polling_package|bool) and (step|int == 2)

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

@ -125,14 +125,16 @@ outputs:
register: ceilometer_ipmi_enabled
- name: "PreUpgrade step0,validation: Check if openstack-ceilometer-ipmi is running"
command: systemctl is-active --quiet openstack-ceilometer-ipmi
when: ceilometer_ipmi_enabled.rc == 0
tags: step0,validation
when: (ceilometer_ipmi_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ceilometer agent ipmi service
tags: step2
service: name=openstack-ceilometer-agent-ipmi state=stopped enabled=no
when: ceilometer_ipmi_enabled.rc == 0
when: (ceilometer_ipmi_enabled.rc == 0) and (step|int == 2)
- name: Set fact for removal of openstack-ceilometer-ipmi package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_ceilometer_ipmi_package|bool) and (step|int == 2)

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

@ -135,14 +135,16 @@ outputs:
register: ceilometer_agent_notification_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-notification is running"
command: systemctl is-active --quiet openstack-ceilometer-notification
when: ceilometer_agent_notification_enabled.rc == 0
tags: step0,validation
when: (ceilometer_agent_notification_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ceilometer agent notification service
tags: step2
service: name=openstack-ceilometer-notification state=stopped enabled=no
when: ceilometer_agent_notification_enabled.rc == 0
when: (ceilometer_agent_notification_enabled.rc == 0) and (step|int == 2)
- name: Set fact for removal of openstack-ceilometer-notification package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_ceilometer_notification_package|bool) and (step|int == 2)

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

@ -207,28 +207,29 @@ outputs:
register: cinder_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
shell: systemctl is-active --quiet openstack-cinder-api
when: cinder_api_enabled.rc == 0
tags: step0,validation
when: (cinder_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable cinder_api service (pre-upgrade not under httpd)
tags: step2
service: name=openstack-cinder-api state=stopped enabled=no
when: cinder_api_enabled.rc == 0
when: (cinder_api_enabled.rc == 0) and (step|int == 2)
- name: check for cinder_api running under apache (post upgrade)
tags: step2
shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
register: cinder_api_apache
ignore_errors: true
when: step|int == 2
- name: Stop and disable cinder_api service
tags: step2
service: name=httpd state=stopped enabled=no
when: cinder_api_apache.rc == 0
when: (cinder_api_apache.rc == 0) and (step|int == 2)
- name: remove old cinder cron jobs
tags: step2
when: step|int == 2
file:
path: /var/spool/cron/cinder
state: absent
- name: Set fact for removal of httpd package
when: step|int == 2
set_fact:
remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove httpd package if operator requests it
yum: name=httpd state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_httpd_package|bool) and (step|int == 2)

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

@ -166,10 +166,13 @@ outputs:
state: directory
upgrade_tasks:
- name: Stop and disable cinder_backup service
tags: step2
when: step|int == 2
service: name=openstack-cinder-backup state=stopped enabled=no
- name: Set fact for removal of openstack-cinder package
when: step|int == 2
set_fact:
remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-cinder package if operator requests it
yum: name=openstack-cinder state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_cinder_package|bool) and (step|int == 2)

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

@ -138,14 +138,16 @@ outputs:
register: cinder_scheduler_enabled
- name: "PreUpgrade step0,validation: Check service openstack-cinder-scheduler is running"
shell: systemctl is-active --quiet openstack-cinder-scheduler
when: cinder_scheduler_enabled.rc == 0
tags: step0,validation
when: (cinder_scheduler_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable cinder_scheduler service
tags: step2
when: cinder_scheduler_enabled.rc == 0
when: (cinder_scheduler_enabled.rc == 0) and (step|int == 2)
service: name=openstack-cinder-scheduler state=stopped enabled=no
- name: Set fact for removal of openstack-cinder package
when: step|int == 2
set_fact:
remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-cinder package if operator requests it
yum: name=openstack-cinder state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_cinder_package|bool) and (step|int == 2)

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

@ -214,14 +214,16 @@ outputs:
register: cinder_volume_enabled
- name: "PreUpgrade step0,validation: Check service openstack-cinder-volume is running"
shell: systemctl is-active --quiet openstack-cinder-volume
when: cinder_volume_enabled.rc == 0
tags: step0,validation
when: (cinder_volume_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable cinder_volume service
tags: step2
when: cinder_volume_enabled.rc == 0
when: (cinder_volume_enabled.rc == 0) and (step|int == 2)
service: name=openstack-cinder-volume state=stopped enabled=no
- name: Set fact for removal of openstack-cinder package
when: step|int == 2
set_fact:
remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-cinder package if operator requests it
yum: name=openstack-cinder state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_cinder_package|bool) and (step|int == 2)

14
docker/services/collectd.yaml
View File

@ -126,14 +126,16 @@ outputs:
register: collectd_enabled
- name: "PreUpgrade step0,validation: Check service collectd service is running"
command: systemctl is-active --quiet collectd
when: collectd_enabled.rc == 0
tags: step0,validation
when: (collectd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable collectd service
tags: step2
when: collectd_enabled.rc == 0
when: (collectd_enabled.rc == 0) and (step|int == 2)
service: name=collectd.service state=stopped enabled=no
- name: Set fact for removal of collectd package
when: step|int == 2
set_fact:
remove_collectd_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove collectd package if operator requests it
yum: name=collectd state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_collectd_package|bool) and (step|int == 2)

14
docker/services/congress.yaml
View File

@ -155,14 +155,16 @@ outputs:
register: congress_enabled
- name: "PreUpgrade step0,validation: Check service openstack-congress-server is running"
command: systemctl is-active --quiet openstack-congress-server
when: congress_enabled.rc == 0
tags: step0,validation
when: (congress_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable congress_api service
tags: step2
when: congress_enabled.rc == 0
when: (congress_enabled.rc == 0) and (step|int == 2)
service: name=openstack-congress-server state=stopped enabled=no
- name: Set fact for removal of openstack-congress package
when: step|int == 2
set_fact:
remove_congress_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-congress package if operator requests it
yum: name=openstack-congress state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_congress_package|bool) and (step|int == 2)

7
docker/services/database/mongodb.yaml
View File

@ -172,9 +172,8 @@ outputs:
register: mongod_enabled
- name: "PreUpgrade step0,validation: Check if mongod is running"
command: systemctl is-active --quiet mongod
when: mongod_enabled.rc == 0
tags: step0,validation
when: (mongod_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable mongodb service
tags: step2
when: mongod_enabled.rc == 0
when: (mongod_enabled.rc == 0) and (step|int == 2)
service: name=mongod state=stopped enabled=no

7
docker/services/database/mysql.yaml
View File

@ -243,9 +243,8 @@ outputs:
register: mariadb_enabled
- name: "PreUpgrade step0,validation: Check if mysql service is running"
command: systemctl is-active --quiet mariadb
when: mariadb_enabled.rc == 0
tags: step0,validation
when: (mariadb_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable mysql service
tags: step2
when: mariadb_enabled.rc == 0
when: (mariadb_enabled.rc == 0) and (step|int == 2)
service: name=mariadb state=stopped enabled=no

7
docker/services/database/redis.yaml
View File

@ -129,9 +129,8 @@ outputs:
register: redis_enabled
- name: "PreUpgrade step0,validation: Check if redis is running"
command: systemctl is-active --quiet redis
when: redis_enabled.rc == 0
tags: step0,validation
when: (redis_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable redis service
tags: step2
when: redis_enabled.rc == 0
when: (redis_enabled.rc == 0) and (step|int == 2)
service: name=redis state=stopped enabled=no

14
docker/services/ec2-api.yaml
View File

@ -217,19 +217,17 @@ outputs:
register: ec2_api_metadata_enabled
- name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running"
command: systemctl is-active --quiet openstack-ec2-api
when: ec2_api_enabled.rc == 0
tags: step0,validation
when: (ec2_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: "PreUpgrade step0,validation: Check if openstack-ec2-metadata-api is running"
command: systemctl is-active --quiet openstack-ec2-api-metadata
when: ec2_api_metadata_enabled.rc == 0
tags: step0,validation
when: (ec2_api_metadata_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable EC2-API service
tags: step2
when: ec2_api_enabled.rc == 0
when: (ec2_api_enabled.rc == 0) and (step|int == 2)
service: name=openstack-ec2-api state=stopped enabled=no
- name: Stop and disable EC2-API-METADATA service
tags: step2
when: ec2_api_metadata_enabled.rc == 0
when: (ec2_api_metadata_enabled.rc == 0) and (step|int == 2)
service: name=openstack-ec2-api-metadata state=stopped enabled=no
metadata_settings:
get_attr: [Ec2ApiPuppetBase, role_data, metadata_settings]

7
docker/services/etcd.yaml
View File

@ -122,9 +122,8 @@ outputs:
register: etcd_enabled
- name: "PreUpgrade step0,validation: Check if etcd is running"
command: systemctl is-active --quiet etcd
when: etcd_enabled.rc == 0
tags: step0,validation
when: (etcd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable etcd service
tags: step2
when: etcd_enabled.rc == 0
when: (etcd_enabled.rc == 0) and (step|int == 2)
service: name=etcd state=stopped enabled=no

2
docker/services/fluentd.yaml
View File

@ -122,6 +122,6 @@ outputs:
state: directory
upgrade_tasks:
- name: Stop and disable fluentd service
tags: step2
when: step|int == 2
service: name=fluentd.service state=stopped enabled=no

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

@ -240,16 +240,18 @@ outputs:
register: glance_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-glance-api is running"
command: systemctl is-active --quiet openstack-glance-api
tags: step0,validation
when: glance_api_enabled.rc == 0
tags: validation
when: (glance_api_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable glance_api service
tags: step2
when: glance_api_enabled.rc == 0
when: (glance_api_enabled.rc == 0) and (step|int == 2)
service: name=openstack-glance-api state=stopped enabled=no
- name: Set fact for removal of openstack-glance package
when: step|int == 2
set_fact:
remove_glance_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-glance package if operator requests it
yum: name=openstack-glance state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_glance_package|bool) and (step|int == 2)
metadata_settings:
get_attr: [GlanceApiPuppetBase, role_data, metadata_settings]

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

@ -202,12 +202,11 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-api is running"
command: systemctl is-active --quiet openstack-gnocchi-api
when: gnocchi_api_enabled.rc == 0 and httpd_enabled.rc != 0
tags: step0,validation
when: (gnocchi_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
tags: validation
- name: Stop and disable gnocchi_api service
tags: step2
service: name=openstack-gnocchi-api state=stopped enabled=no
when: gnocchi_api_enabled.rc == 0 and httpd_enabled.rc != 0
when: (gnocchi_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
tags: common
@ -215,11 +214,10 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if gnocchi_api_wsgi is running"
shell: systemctl status 'httpd' | grep -q gnocchi
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop and disable httpd service
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
metadata_settings:
get_attr: [GnocchiApiPuppetBase, role_data, metadata_settings]

7
docker/services/gnocchi-metricd.yaml
View File

@ -141,9 +141,8 @@ outputs:
register: gnocchi_metricd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-metricd is running"
command: systemctl is-active --quiet openstack-gnocchi-metricd
when: gnocchi_metricd_enabled.rc == 0
tags: step0,validation
when: (gnocchi_metricd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable openstack-gnocchi-metricd service
tags: step2
when: gnocchi_metricd_enabled.rc == 0
when: (gnocchi_metricd_enabled.rc == 0) and (step|int == 2)
service: name=openstack-gnocchi-metricd.service state=stopped enabled=no

7
docker/services/gnocchi-statsd.yaml
View File

@ -141,9 +141,8 @@ outputs:
register: gnocchi_statsd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-statsd is running"
command: systemctl is-active --quiet openstack-gnocchi-statsd
when: gnocchi_statsd_enabled.rc == 0
tags: step0,validation
when: (gnocchi_statsd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable openstack-gnocchi-statsd service
tags: step2
when: gnocchi_statsd_enabled.rc == 0
when: (gnocchi_statsd_enabled.rc == 0) and (step|int == 2)
service: name=openstack-gnocchi-statsd.service state=stopped enabled=no

14
docker/services/heat-api-cfn.yaml
View File

@ -142,24 +142,22 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-heat-api-cfn is running"
command: systemctl is-active --quiet openstack-heat-api-cfn
when: heat_api_cfn_enabled.rc == 0 and httpd_enabled.rc != 0
tags: step0,validation
when: (heat_api_cfn_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
tags: validation
- name: Stop and disable heat_api_cfn service (pre-upgrade not under httpd)
tags: step2
service: name=openstack-heat-api-cfn state=stopped enabled=no
when: heat_api_cfn_enabled.rc == 0 and httpd_enabled.rc != 0
when: (heat_api_cfn_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
tags: common
ignore_errors: True
register: httpd_running
- name: "PreUpgrade step0,validation: Check if heat_api_cfn_wsgi is running"
tags: step0,validation
tags: validation
shell: systemctl status 'httpd' | grep -q heat_api_cfn_wsgi
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop heat_api_cfn service (running under httpd)
tags: step2
service: name=httpd state=stopped
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
metadata_settings:
get_attr: [HeatBase, role_data, metadata_settings]

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

@ -168,12 +168,11 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-heat-api is running"
command: systemctl is-active --quiet openstack-heat-api
when: heat_api_enabled.rc == 0 and httpd_enabled.rc != 0
tags: step0,validation
when: (heat_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
tags: validation
- name: Stop and disable heat_api service (pre-upgrade not under httpd)
tags: step2
service: name=openstack-heat-api state=stopped enabled=no
when: heat_api_enabled.rc == 0 and httpd_enabled.rc != 0
when: (heat_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
- name: Check if httpd is running
tags: common
command: systemctl is-active --quiet httpd
@ -181,14 +180,13 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if heat_api_wsgi is running"
shell: systemctl status 'httpd' | grep -q heat_api_wsgi
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop heat_api service (running under httpd)
tags: step2
service: name=httpd state=stopped
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
- name: remove old heat cron jobs
tags: step2
when: step|int == 2
file:
path: /var/spool/cron/heat
state: absent

7
docker/services/heat-engine.yaml
View File

@ -141,9 +141,8 @@ outputs:
register: heat_engine_enabled
- name: "PreUpgrade step0,validation: Check service openstack-heat-engine is running"
command: systemctl is-active --quiet openstack-heat-engine
when: heat_engine_enabled.rc == 0
tags: step0,validation
when: (heat_engine_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable heat_engine service
tags: step2
when: heat_engine_enabled.rc == 0
when: (heat_engine_enabled.rc == 0) and (step|int == 2)
service: name=openstack-heat-engine state=stopped enabled=no

7
docker/services/horizon.yaml
View File

@ -194,11 +194,10 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check if horizon is running"
shell: systemctl is-active --quiet httpd
when: httpd_enabled.rc == 0
tags: step0,validation
when: (httpd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable horizon service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0
when: (httpd_enabled.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
metadata_settings:
get_attr: [HorizonBase, role_data, metadata_settings]

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

@ -163,11 +163,10 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ironic-api is running"
command: systemctl is-active --quiet openstack-ironic-api
when: ironic_api_enabled.rc == 0 and httpd_enabled.rc != 0
tags: step0,validation
when: (ironic_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
tags: validation
- name: Stop and disable ironic_api service
tags: step2
when: ironic_api_enabled.rc == 0 and httpd_enabled.rc != 0
when: (ironic_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
service: name=openstack-ironic-api state=stopped enabled=no
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
@ -176,9 +175,8 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if ironic_api_wsgi is running"
shell: systemctl status 'httpd' | grep -q ironic
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop ironic_api service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no

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

@ -174,9 +174,8 @@ outputs:
register: ironic_conductor_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ironic-conductor is running"
command: systemctl is-active --quiet openstack-ironic-conductor
tags: step0,validation
when: ironic_conductor_enabled.rc == 0
tags: validation
when: (ironic_conductor_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable ironic_conductor service
tags: step2
when: ironic_conductor_enabled.rc == 0
when: (ironic_conductor_enabled.rc == 0) and (step|int == 2)
service: name=openstack-ironic-conductor state=stopped enabled=no

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

@ -171,9 +171,9 @@ outputs:
/var/log/containers/ironic-inspector.
ignore_errors: true
upgrade_tasks:
- when: step|int ==2
block:
- name: Stop and disable ironic_inspector service
tags: step2
service: name=openstack-ironic-inspector state=stopped enabled=no
- name: Stop and disable ironic_inspector dnsmasq service
tags: step2
service: name=openstack-ironic-inspector-dnsmasq state=stopped enabled=no

14
docker/services/iscsid.yaml
View File

@ -117,11 +117,10 @@ outputs:
register: iscsid_enabled
- name: "PreUpgrade step0,validation: Check if iscsid is running"
command: systemctl is-active --quiet iscsid
when: iscsid_enabled.rc == 0
tags: step0,validation
when: (iscsid_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable iscsid service
tags: step2
when: iscsid_enabled.rc == 0
when: (iscsid_enabled.rc == 0) and (step|int == 2)
service: name=iscsid state=stopped enabled=no
- name: Check if iscsid.socket service is deployed
tags: common
@ -130,9 +129,8 @@ outputs:
register: iscsid_socket_enabled
- name: "PreUpgrade step0,validation: Check if iscsid.socket is running"
command: systemctl is-active --quiet iscsid.socket
when: iscsid_socket_enabled.rc == 0
tags: step0,validation
when: (iscsid_socket_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable iscsid.socket service
tags: step2
when: iscsid_socket_enabled.rc == 0
when: (iscsid_socket_enabled.rc == 0) and (step|int == 2)
service: name=iscsid.socket state=stopped enabled=no

9
docker/services/keystone.yaml
View File

@ -209,14 +209,13 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if keystone_wsgi is running under httpd"
shell: systemctl status 'httpd' | grep -q keystone
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop and disable keystone service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
- name: remove old keystone cron jobs
tags: step2
when: step|int == 2
file:
path: /var/spool/cron/keystone
state: absent

7
docker/services/manila-api.yaml
View File

@ -145,9 +145,8 @@ outputs:
register: manila_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-manila-api is running"
command: systemctl is-active --quiet openstack-manila-api
when: manila_api_enabled.rc == 0
tags: step0,validation
when: (manila_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable manila_api service
tags: step2
when: manila_api_enabled.rc == 0
when: (manila_api_enabled.rc == 0) and (step|int == 2)
service: name=openstack-manila-api state=stopped enabled=no

7
docker/services/manila-scheduler.yaml
View File

@ -121,9 +121,8 @@ outputs:
register: manila_scheduler_enabled
- name: "PreUpgrade step0,validation: Check service openstack-manila-scheduler is running"
command: systemctl is-active --quiet openstack-manila-scheduler
when: manila_scheduler_enabled.rc == 0
tags: step0,validation
when: (manila_scheduler_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable manila_scheduler service
tags: step2
when: manila_scheduler_enabled.rc == 0
when: (manila_scheduler_enabled.rc == 0) and (step|int == 2)
service: name=openstack-manila-scheduler state=stopped enabled=no

7
docker/services/manila-share.yaml
View File

@ -140,9 +140,8 @@ outputs:
register: manila_share_enabled
- name: "PreUpgrade step0,validation: Check service openstack-manila-share is running"
command: systemctl is-active --quiet openstack-manila-share
when: manila_share_enabled.rc == 0
tags: step0,validation
when: (manila_share_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable manila_share service
tags: step2
when: manila_share_enabled.rc == 0
when: (manila_share_enabled.rc == 0) and (step|int == 2)
service: name=openstack-manila-share state=stopped enabled=no

7
docker/services/memcached.yaml
View File

@ -122,9 +122,8 @@ outputs:
register: memcached_enabled
- name: "PreUpgrade step0,validation: Check service memcached is running"
command: systemctl is-active --quiet memcached
when: memcached_enabled.rc == 0
tags: step0,validation
when: (memcached_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable memcached service
tags: step2
when: memcached_enabled.rc == 0
when: (memcached_enabled.rc == 0) and (step|int == 2)
service: name=memcached state=stopped enabled=no

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

@ -205,11 +205,10 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check if openstack-mistral-api is running"
command: systemctl is-active --quiet openstack-mistral-api
when: mistral_api_enabled.rc == 0 and httpd_enabled.rc != 0
tags: step0,validation
when: (mistral_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
tags: validation
- name: Stop and disable mistral_api service (pre-upgrade not under httpd)
tags: step2
when: mistral_api_enabled.rc == 0 and httpd_enabled.rc != 0
when: (mistral_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
service: name=openstack-mistral-api state=stopped enabled=no
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
@ -218,9 +217,8 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if mistral_api_wsgi is running"
shell: systemctl status 'httpd' | grep -q mistral
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop mistral_api service (running under httpd)
tags: step2
service: name=httpd state=stopped enabled=no
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)

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

@ -128,9 +128,8 @@ outputs:
register: mistral_engine_enabled
- name: "PreUpgrade step0,validation: Check if openstack-mistral-engine is running"
command: systemctl is-active --quiet openstack-mistral-engine
when: mistral_engine_enabled.rc == 0
tags: step0,validation
when: (mistral_engine_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable mistral_engine service
tags: step2
when: mistral_engine_enabled.rc == 0
when: (mistral_engine_enabled.rc == 0) and (step|int == 2)
service: name=openstack-mistral-engine state=stopped enabled=no

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

@ -126,9 +126,8 @@ outputs:
register: mistral_event_engine_enabled
- name: "PreUpgrade step0,validation: Check if openstack-mistral-event-engine is running"
command: systemctl is-active --quiet openstack-mistral-event-engine
when: mistral_event_engine_enabled.rc == 0
tags: step0,validation
when: (mistral_event_engine_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable mistral_event_engine service
tags: step2
when: mistral_event_engine_enabled.rc == 0
when: (mistral_event_engine_enabled.rc == 0) and (step|int == 2)
service: name=openstack-mistral-event-engine state=stopped enabled=no

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

@ -132,9 +132,8 @@ outputs:
register: mistral_executor_enabled
- name: "PreUpgrade step0,validation: Check if openstack-mistral-executor is running"
command: systemctl is-active --quiet openstack-mistral-executor
when: mistral_executor_enabled.rc == 0
tags: step0,validation
when: (mistral_executor_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable mistral_executor service
tags: step2
when: mistral_executor_enabled.rc == 0
when: (mistral_executor_enabled.rc == 0) and (step|int == 2)
service: name=openstack-mistral-executor state=stopped enabled=no

7
docker/services/multipathd.yaml
View File

@ -93,9 +93,8 @@ outputs:
register: multipathd_enabled
- name: "PreUpgrade step0,validation: Check service multipathd is running"
command: systemctl is-active --quiet multipathd
when: multipathd_enabled.rc == 0
tags: step0,validation
when: (multipathd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable multipathd service
tags: step2
when: multipathd_enabled.rc == 0
when: (multipathd_enabled.rc == 0) and (step|int == 2)
service: name=multipathd state=stopped enabled=no

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

@ -176,16 +176,18 @@ outputs:
register: neutron_server_enabled
- name: "PreUpgrade step0,validation: Check service neutron-server is running"
command: systemctl is-active --quiet neutron-server
when: neutron_server_enabled.rc == 0
tags: step0,validation
when: (neutron_server_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_api service
tags: step2
when: neutron_server_enabled.rc == 0
when: (neutron_server_enabled.rc == 0) and (step|int == 2)
service: name=neutron-server state=stopped enabled=no
- name: Set fact for removal of openstack-neutron package
when: step|int == 2
set_fact:
remove_neutron_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove openstack-neutron package if operator requests it
yum: name=openstack-neutron state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_neutron_package|bool) and (step|int == 2)
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]

7
docker/services/neutron-dhcp.yaml
View File

@ -127,9 +127,8 @@ outputs:
register: neutron_dhcp_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-dhcp-agent is running"
command: systemctl is-active --quiet neutron-dhcp-agent
when: neutron_dhcp_agent_enabled.rc == 0
tags: step0,validation
when: (neutron_dhcp_agent_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_dhcp service
tags: step2
when: neutron_dhcp_agent_enabled.rc == 0
when: (neutron_dhcp_agent_enabled.rc == 0) and (step|int == 2)
service: name=neutron-dhcp-agent state=stopped enabled=no

7
docker/services/neutron-l3.yaml
View File

@ -125,9 +125,8 @@ outputs:
register: neutron_l3_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running"
command: systemctl is-active --quiet neutron-l3-agent
when: neutron_l3_agent_enabled.rc == 0
tags: step0,validation
when: (neutron_l3_agent_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_l3 service
tags: step2
when: neutron_l3_agent_enabled.rc == 0
when: (neutron_l3_agent_enabled.rc == 0) and (step|int == 2)
service: name=neutron-l3-agent state=stopped enabled=no

7
docker/services/neutron-metadata.yaml
View File

@ -124,9 +124,8 @@ outputs:
register: neutron_metadata_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-metadata-agent is running"
command: systemctl is-active --quiet neutron-metadata-agent
when: neutron_metadata_agent_enabled.rc == 0
tags: step0,validation
when: (neutron_metadata_agent_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_metadata service
tags: step2
when: neutron_metadata_agent_enabled.rc == 0
when: (neutron_metadata_agent_enabled.rc == 0) and (step|int == 2)
service: name=neutron-metadata-agent state=stopped enabled=no

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

@ -150,14 +150,16 @@ outputs:
register: neutron_ovs_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
command: systemctl is-active --quiet neutron-openvswitch-agent
when: neutron_ovs_agent_enabled.rc == 0
tags: step0,validation
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_ovs_agent service
tags: step2
when: neutron_ovs_agent_enabled.rc == 0
when: (neutron_ovs_agent_enabled.rc == 0) and (step|int == 2)
service: name=neutron-openvswitch-agent state=stopped enabled=no
- name: Set fact for removal of openstack-neutron-openvswitch package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_neutron_openvswitch_package|bool) and (step|int == 2)

7
docker/services/neutron-sriov-agent.yaml
View File

@ -112,9 +112,8 @@ outputs:
register: neutron_sriov_nic_agent_enabled
- name: "PreUpgrade step0,validation: Check service neutron-sriov-nic-agent is running"
command: systemctl is-active --quiet neutron-sriov-nic-agent
when: neutron_sriov_nic_agent_enabled.rc == 0
tags: step0,validation
when: (neutron_sriov_nic_agent_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable neutron_sriov_agent service
tags: step2
when: neutron_sriov_nic_agent_enabled.rc == 0
when: (neutron_sriov_nic_agent_enabled.rc == 0) and (step|int == 2)
service: name=neutron-sriov-nic-agent state=stopped enabled=no

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

@ -318,11 +318,10 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-api is running"
command: systemctl is-active --quiet openstack-nova-api
tags: step0,validation
when: nova_api_enabled.rc == 0 and httpd_enabled.rc != 0
tags: validation
when: (nova_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 0)
- name: Stop and disable nova_api service
tags: step2
when: nova_api_enabled.rc == 0 and httpd_enabled.rc != 0
when: (nova_api_enabled.rc == 0) and (httpd_enabled.rc != 0) and (step|int == 2)
service: name=openstack-nova-api state=stopped enabled=no
- name: Check if httpd service is running
command: systemctl is-active --quiet httpd
@ -330,20 +329,22 @@ outputs:
ignore_errors: True
register: httpd_running
- name: "PreUpgrade step0,validation: Check if nova_wsgi is running"
tags: step0,validation
tags: validation
shell: systemctl status 'httpd' | grep -q 'nova'
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop nova_api service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped
- name: Set fact for removal of openstack-nova-api package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_api_package|bool) and (step|int == 2)
- name: remove old nova cron jobs
tags: step2
when: step|int == 2
file:
path: /var/spool/cron/nova
state: absent

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

@ -182,7 +182,7 @@ outputs:
ignore_errors: True
register: nova_compute_enabled
- name: Set compute upgrade level to auto
tags: step1
when: step|int == 1
ini_file:
str_replace:
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
@ -190,14 +190,16 @@ outputs:
LEVEL: {get_param: UpgradeLevelNovaCompute}
- name: "PreUpgrade step0,validation: Check service openstack-nova-compute is running"
command: systemctl is-active --quiet openstack-nova-compute
tags: step0,validation
when: nova_compute_enabled.rc == 0
tags: validation
when: (nova_compute_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova-compute service
tags: step2
when: nova_compute_enabled.rc == 0
when: (nova_compute_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-compute state=stopped enabled=no
- name: Set fact for removal of openstack-nova-compute package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_compute_package|bool) and (step|int == 2)

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

@ -134,7 +134,7 @@ outputs:
ignore_errors: True
register: nova_conductor_enabled
- name: Set compute upgrade level to auto
tags: step1
when: step|int == 1
ini_file:
str_replace:
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
@ -142,14 +142,16 @@ outputs:
LEVEL: {get_param: UpgradeLevelNovaCompute}
- name: "PreUpgrade step0,validation: Check service openstack-nova-conductor is running"
command: systemctl is-active --quiet openstack-nova-conductor
tags: step0,validation
when: nova_conductor_enabled.rc == 0
tags: validation
when: (nova_conductor_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova_conductor service
tags: step2
when: nova_conductor_enabled.rc == 0
when: (nova_conductor_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-conductor state=stopped enabled=no
- name: Set fact for removal of openstack-nova-conductor package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_conductor_package|bool) and (step|int == 2)

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

@ -130,14 +130,16 @@ outputs:
register: nova_consoleauth_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-consoleauth is running"
command: systemctl is-active --quiet openstack-nova-consoleauth
tags: step0,validation
when: nova_consoleauth_enabled.rc == 0
tags: validation
when: (nova_consoleauth_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova_consoleauth service
tags: step2
when: nova_consoleauth_enabled.rc == 0
when: (nova_consoleauth_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-consoleauth state=stopped enabled=no
- name: Set fact for removal of openstack-nova-console package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_console_package|bool) and (step|int == 2)

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

@ -137,9 +137,8 @@ outputs:
register: nova_ironic_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-compute is running"
command: systemctl is-active --quiet openstack-nova-compute
tags: step0,validation
when: nova_ironic_enabled.rc == 0
tags: validation
when: (nova_ironic_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova-compute service
tags: step2
when: nova_ironic_enabled.rc == 0
when: (nova_ironic_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-compute state=stopped enabled=no

7
docker/services/nova-libvirt.yaml
View File

@ -317,9 +317,8 @@ outputs:
register: nova_libvirt_enabled
- name: "PreUpgrade step0,validation: Check service libvirtd is running"
command: systemctl is-active --quiet libvirtd
tags: step0,validation
when: nova_libvirt_enabled.rc == 0
tags: validation
when: (nova_libvirt_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable libvirtd service
tags: step2
when: nova_libvirt_enabled.rc == 0
when: (nova_libvirt_enabled.rc == 0) and (step|int == 2)
service: name=libvirtd state=stopped enabled=no

7
docker/services/nova-metadata.yaml
View File

@ -124,9 +124,8 @@ outputs:
register: nova_metadata_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-api is running"
command: systemctl is-active --quiet openstack-nova-api
tags: step0,validation
when: nova_metadata_enabled.rc == 0
tags: validation
when: (nova_metadata_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova_api service
tags: step2
when: nova_metadata_enabled.rc == 0
when: (nova_metadata_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-api state=stopped enabled=no

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

@ -150,15 +150,17 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if placement_wsgi is running"
shell: systemctl status 'httpd' | grep -q placement_wsgi
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop and disable nova_placement service (running under httpd)
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
- name: Set fact for removal of httpd package
when: step|int == 2
set_fact:
remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages}
- name: Remove httpd package if operator requests it
yum: name=httpd state=removed
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_httpd_package|bool) and (step|int == 2)

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

@ -131,14 +131,16 @@ outputs:
register: nova_scheduler_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-scheduler is running"
command: systemctl is-active --quiet openstack-nova-scheduler
tags: step0,validation
when: nova_scheduler_enabled.rc == 0
tags: validation
when: (nova_scheduler_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova_scheduler service
tags: step2
when: nova_scheduler_enabled.rc == 0
when: (nova_scheduler_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-scheduler state=stopped enabled=no
- name: Set fact for removal of openstack-nova-scheduler package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_scheduler_package|bool) and (step|int == 2)

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

@ -130,14 +130,16 @@ outputs:
register: nova_vncproxy_enabled
- name: "PreUpgrade step0,validation: Check service openstack-nova-novncproxy is running"
command: systemctl is-active --quiet openstack-nova-novncproxy
tags: step0,validation
when: nova_vncproxy_enabled.rc == 0
tags: validation
when: (nova_vncproxy_enabled.rc == 0) and (step|int == 0)
- name: Stop and disable nova_vnc_proxy service
tags: step2
when: nova_vncproxy_enabled.rc == 0
when: (nova_vncproxy_enabled.rc == 0) and (step|int == 2)
service: name=openstack-nova-novncproxy state=stopped enabled=no
- name: Set fact for removal of openstack-nova-novncproxy package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_nova_novncproxy_package|bool) and (step|int == 2)

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

@ -184,5 +184,5 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable octavia_api service
tags: step2
when: step|int == 2
service: name=openstack-octavia-api state=stopped enabled=no

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

@ -126,10 +126,13 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable octavia_health_manager service
tags: step2
when: step|int == 2
service: name=openstack-octavia-health-manager state=stopped enabled=no
- name: Set fact for removal of openstack-octavia-health-manager package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_octavia_health_manager_package|bool) and (step|int == 2)

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

@ -122,5 +122,5 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable octavia_housekeeping service
tags: step2
when: step|int == 2
service: name=openstack-octavia-housekeeping state=stopped enabled=no

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

@ -122,5 +122,5 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable octavia_worker service
tags: step2
when: step|int == 2
service: name=openstack-octavia-worker state=stopped enabled=no

7
docker/services/opendaylight-api.yaml
View File

@ -129,9 +129,8 @@ outputs:
register: opendaylight_enabled
- name: "PreUpgrade step0,validation: Check service opendaylight is running"
command: systemctl is-active --quiet opendaylight
when: opendaylight_enabled.rc == 0
tags: step0,validation
when: (opendaylight_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable opendaylight_api service
tags: step2
when: opendaylight_enabled.rc == 0
when: (opendaylight_enabled.rc == 0) and (step|int == 2)
service: name=opendaylight state=stopped enabled=no

7
docker/services/ovn-controller.yaml
View File

@ -120,9 +120,8 @@ outputs:
register: ovn_controller_enabled
- name: "PreUpgrade step0,validation: Check service ovn_controller is running"
command: systemctl is-active --quiet ovn-controller
when: ovn_controller_enabled.rc == 0
tags: step0,validation
when: (ovn_controller_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ovn-controller service
tags: step2
when: ovn_controller_enabled.rc == 0
when: (ovn_controller_enabled.rc == 0) and (step|int == 2)
service: name=ovn-controller state=stopped enabled=no

7
docker/services/ovn-dbs.yaml
View File

@ -212,9 +212,8 @@ outputs:
register: ovn_northd_enabled
- name: "PreUpgrade step0,validation: Check service ovn_northd is running"
command: systemctl is-active --quiet ovn-northd
when: ovn_northd_enabled.rc == 0
tags: step0,validation
when: (ovn_northd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable ovn-northd service
tags: step2
when: ovn_northd_enabled.rc == 0
when: (ovn_northd_enabled.rc == 0) and (step|int == 2)
service: name=ovn-northd state=stopped enabled=no

16
docker/services/pacemaker/cinder-backup.yaml
View File

@ -218,8 +218,9 @@ outputs:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- when: (is_bootstrap_node) and (step|int == 2)
block:
- name: Disable the openstack-cinder-backup cluster resource
tags: step2
pacemaker_resource:
resource: openstack-cinder-backup
state: disable
@ -227,9 +228,7 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node
- name: Delete the stopped openstack-cinder-backup cluster resource.
tags: step2
pacemaker_resource:
resource: openstack-cinder-backup
state: delete
@ -237,19 +236,18 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node
- name: Disable cinder_backup service
tags: step2
when: step|int == 2
service: name=openstack-cinder-backup enabled=no
update_tasks:
- name: Get docker Cinder-Backup image
set_fact:
docker_image: {get_param: DockerCinderBackupImage}
docker_image_latest: *cinder_backup_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Pull latest Cinder-Backup images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Get previous Cinder-Backup image id
shell: "docker images | awk '/cinder-backup.* pcmklatest/{print $3}'"
register: cinder_backup_image_id
@ -264,10 +262,10 @@ outputs:
- name: Remove previous Cinder-Backup images
shell: "docker rmi -f {{cinder_backup_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- cinder_backup_image_id.stdout != ''
- name: Retag pcmklatest to latest Cinder-Backup image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

16
docker/services/pacemaker/cinder-volume.yaml
View File

@ -243,8 +243,9 @@ outputs:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- when: (is_bootstrap_node) and (step|int == 2)
block:
- name: Disable the openstack-cinder-volume cluster resource
tags: step2
pacemaker_resource:
resource: openstack-cinder-volume
state: disable
@ -252,9 +253,7 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node
- name: Delete the stopped openstack-cinder-volume cluster resource.
tags: step2
pacemaker_resource:
resource: openstack-cinder-volume
state: delete
@ -262,16 +261,15 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node
- name: Disable cinder_volume service from boot
tags: step2
when: step|int == 2
service: name=openstack-cinder-volume enabled=no
update_tasks:
- name: Get docker Cinder-Volume image
set_fact:
docker_image: {get_param: DockerCinderVolumeImage}
docker_image_latest: *cinder_volume_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Cinder-Volume image id
shell: "docker images | awk '/cinder-volume.* pcmklatest/{print $3}'"
register: cinder_volume_image_id
@ -286,13 +284,13 @@ outputs:
- name: Remove previous Cinder-Volume images
shell: "docker rmi -f {{cinder_volume_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- cinder_volume_image_id.stdout != ''
- name: Pull latest Cinder-Volume images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Cinder-Volume image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

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

@ -285,15 +285,16 @@ outputs:
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Check cluster resource status
tags: step2
when: step|int == 2
pacemaker_resource:
resource: galera
state: master
check_mode: true
ignore_errors: true
register: galera_res
- when: (is_bootstrap_node) and (galera_res|succeeded) and (step|int == 2)
block:
- name: Disable the galera cluster resource
tags: step2
pacemaker_resource:
resource: galera
state: disable
@ -301,9 +302,8 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and galera_res|succeeded
- name: Delete the stopped galera cluster resource.
tags: step2
when: step|int == 2
pacemaker_resource:
resource: galera
state: delete
@ -311,22 +311,21 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and galera_res|succeeded
- name: Disable mysql service
tags: step2
when: step|int == 2
service: name=mariadb enabled=no
- name: Remove clustercheck service from xinetd
tags: step2
when: step|int == 2
file: state=absent path=/etc/xinetd.d/galera-monitor
- name: Restart xinetd service after clustercheck removal
tags: step2
when: step|int == 2
service: name=xinetd state=restarted
update_tasks:
- name: Get docker Mariadb image
set_fact:
docker_image: {get_param: DockerMysqlImage}
docker_image_latest: *mysql_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Mariadb image id
shell: "docker images | awk '/mariadb.* pcmklatest/{print $3}'"
register: mariadb_image_id
@ -341,13 +340,13 @@ outputs:
- name: Remove previous Mariadb images
shell: "docker rmi -f {{mariadb_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- mariadb_image_id.stdout != ''
- name: Pull latest Mariadb images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Mariadb image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

18
docker/services/pacemaker/database/redis.yaml
View File

@ -195,15 +195,16 @@ outputs:
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Check cluster resource status
tags: step2
when: step|int == 2
pacemaker_resource:
resource: {get_attr: [RedisBase, role_data, service_name]}
state: master
check_mode: true
ignore_errors: true
register: redis_res
- when: (is_bootstrap_node) and (redis_res|succeeded) and (step|int == 2)
block:
- name: Disable the redis cluster resource
tags: step2
pacemaker_resource:
resource: {get_attr: [RedisBase, role_data, service_name]}
state: disable
@ -211,9 +212,7 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and redis_res|succeeded
- name: Delete the stopped redis cluster resource.
tags: step2
pacemaker_resource:
resource: {get_attr: [RedisBase, role_data, service_name]}
state: delete
@ -221,16 +220,15 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and redis_res|succeeded
- name: Disable redis service
tags: step2
when: step|int == 2
service: name=redis enabled=no
update_tasks:
- name: Get docker Redis image
set_fact:
docker_image: {get_param: DockerRedisImage}
docker_image_latest: *redis_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Redis image id
shell: "docker images | awk '/redis.* pcmklatest/{print $3}'"
register: redis_image_id
@ -245,13 +243,13 @@ outputs:
- name: Remove previous Redis images
shell: "docker rmi -f {{redis_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- redis_image_id.stdout != ''
- name: Pull latest Redis images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Redis image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

16
docker/services/pacemaker/haproxy.yaml
View File

@ -237,15 +237,16 @@ outputs:
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Check cluster resource status
tags: step2
when: step|int == 2
pacemaker_resource:
resource: {get_attr: [HAProxyBase, role_data, service_name]}
state: started
check_mode: true
ignore_errors: true
register: haproxy_res
- when: (is_bootstrap_node) and (haproxy_res|succeeded) and (step|int == 2)
block:
- name: Disable the haproxy cluster resource.
tags: step2
pacemaker_resource:
resource: {get_attr: [HAProxyBase, role_data, service_name]}
state: disable
@ -253,9 +254,7 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and haproxy_res|succeeded
- name: Delete the stopped haproxy cluster resource.
tags: step2
pacemaker_resource:
resource: {get_attr: [HAProxyBase, role_data, service_name]}
state: delete
@ -263,13 +262,12 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and haproxy_res|succeeded
update_tasks:
- name: Get docker Haproxy image
set_fact:
docker_image: {get_param: DockerHAProxyImage}
docker_image_latest: *haproxy_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Haproxy image id
shell: "docker images | awk '/haproxy.* pcmklatest/{print $3}'"
register: haproxy_image_id
@ -284,13 +282,13 @@ outputs:
- name: Remove previous Haproxy images
shell: "docker rmi -f {{haproxy_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- haproxy_image_id.stdout != ''
- name: Pull latest Haproxy images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Haproxy image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

10
docker/services/pacemaker/manila-share.yaml
View File

@ -182,14 +182,14 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable manila_share service
tags: step2
when: step|int == 2
service: name=openstack-manila-share state=stopped enabled=no
update_tasks:
- name: Get docker Manila-Share image
set_fact:
docker_image: {get_param: DockerManilaShareImage}
docker_image_latest: *manila_share_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Manila-Share image id
shell: "docker images | awk '/manila-share.* pcmklatest/{print $3}'"
register: manila_share_image_id
@ -204,13 +204,13 @@ outputs:
- name: Remove previous Manila-Share images
shell: "docker rmi -f {{manila_share_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- manila_share_image_id.stdout != ''
- name: Pull latest Manila-Share images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Manila-Share image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

2
docker/services/pacemaker/ovn-dbs.yaml
View File

@ -156,5 +156,5 @@ outputs:
ignore_errors: true
upgrade_tasks:
- name: Stop and disable ovn-northd service
tags: step2
when: step|int == 2
service: name=ovn-northd state=stopped enabled=no

18
docker/services/pacemaker/rabbitmq.yaml
View File

@ -233,15 +233,16 @@ outputs:
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Check cluster resource status
tags: step2
when: step|int == 2
pacemaker_resource:
resource: {get_attr: [RabbitmqBase, role_data, service_name]}
state: started
check_mode: true
ignore_errors: true
register: rabbitmq_res
- when: (is_bootstrap_node) and (rabbitmq_res|succeeded) and (step|int == 2)
block:
- name: Disable the rabbitmq cluster resource.
tags: step2
pacemaker_resource:
resource: {get_attr: [RabbitmqBase, role_data, service_name]}
state: disable
@ -249,9 +250,7 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and rabbitmq_res|succeeded
- name: Delete the stopped rabbitmq cluster resource.
tags: step2
pacemaker_resource:
resource: {get_attr: [RabbitmqBase, role_data, service_name]}
state: delete
@ -259,16 +258,15 @@ outputs:
register: output
retries: 5
until: output.rc == 0
when: is_bootstrap_node and rabbitmq_res|succeeded
- name: Disable rabbitmq service
tags: step2
when: step|int == 2
service: name=rabbitmq-server enabled=no
update_tasks:
- name: Get docker Rabbitmq image
set_fact:
docker_image: {get_param: DockerRabbitmqImage}
docker_image_latest: *rabbitmq_image_pcmklatest
when: step == '2'
when: step|int == 2
- name: Get previous Rabbitmq image id
shell: "docker images | awk '/rabbitmq.* pcmklatest/{print $3}'"
register: rabbitmq_image_id
@ -283,13 +281,13 @@ outputs:
- name: Remove previous Rabbitmq images
shell: "docker rmi -f {{rabbitmq_image_id.stdout}}"
when:
- step == '2'
- step|int == 2
- rabbitmq_image_id.stdout != ''
- name: Pull latest Rabbitmq images
command: "docker pull {{docker_image}}"
when: step == "2"
when: step|int == 2
- name: Retag pcmklatest to latest Rabbitmq image
shell: "docker tag {{docker_image}} {{docker_image_latest}}"
when: step == "2"
when: step|int == 2
# Got to check that pacemaker_is_active is working fine with bundle.
# TODO: pacemaker_is_active resource doesn't support bundle.

7
docker/services/rabbitmq.yaml
View File

@ -232,11 +232,10 @@ outputs:
register: rabbitmq_enabled
- name: "PreUpgrade step0,validation: Check service rabbitmq server is running"
command: systemctl is-active --quiet rabbitmq-server
when: rabbitmq_enabled.rc == 0
tags: step0,validation
when: (rabbitmq_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable rabbitmq service
tags: step2
when: rabbitmq_enabled.rc == 0
when: (rabbitmq_enabled.rc == 0) and (step|int == 2)
service: name=rabbitmq-server state=stopped enabled=no
update_tasks:
# TODO: Are we sure we want to support this. Rolling update

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

@ -152,14 +152,16 @@ outputs:
register: sahara_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-sahara-api is running"
command: systemctl is-active --quiet openstack-sahara-api
when: sahara_api_enabled.rc == 0
tags: step0,validation
when: (sahara_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable sahara_api service
tags: step2
when: sahara_api_enabled.rc == 0
when: (sahara_api_enabled.rc == 0) and (step|int == 2)
service: name=openstack-sahara-api state=stopped enabled=no
- name: Set fact for removal of openstack-sahara-api package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_sahara_api_package|bool) and (step|int == 2)

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

@ -137,14 +137,16 @@ outputs:
register: sahara_engine_enabled
- name: "PreUpgrade step0,validation: Check service openstack-sahara-engine is running"
command: systemctl is-active --quiet openstack-sahara-engine
when: sahara_engine_enabled.rc == 0
tags: step0,validation
when: (sahara_engine_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable sahara_engine service
tags: step2
when: sahara_engine_enabled.rc == 0
when: (sahara_engine_enabled.rc == 0) and (step|int == 2)
service: name=openstack-sahara-engine state=stopped enabled=no
- name: Set fact for removal of openstack-sahara-engine package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_sahara_engine_package|bool) and (step|int == 2)

7
docker/services/sensu-client.yaml
View File

@ -160,9 +160,8 @@ outputs:
register: sensu_enabled
- name: "PreUpgrade step0,validation: Check if sensu client is running"
command: systemctl is-active --quiet sensu-client
when: sensu_enabled.rc == 0
tags: step0,validation
when: (sensu_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable sensu-client service
tags: step2
when: sensu_enabled.rc == 0
when: (sensu_enabled.rc == 0) and (step|int == 2)
service: name=sensu-client state=stopped enabled=no

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

@ -157,18 +157,20 @@ outputs:
- openstack-swift-object-expirer
- name: "PreUpgrade step0,validation: Check service openstack-swift-proxy and openstack-swift-object-expirer are running"
command: systemctl is-active --quiet "{{ item.item }}"
when: item.rc == 0
tags: step0,validation
when: (item.rc == 0) and (step|int == 0)
tags: validation
with_items: "{{ swift_proxy_services_enabled.results }}"
- name: Stop and disable swift-proxy and swift-object-expirer services
tags: step2
when: item.rc == 0
when: (item.rc == 0) and (step|int == 2)
service: name={{ item.item }} state=stopped enabled=no
with_items: "{{ swift_proxy_services_enabled.results }}"
- name: Set fact for removal of openstack-swift-proxy package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_swift_proxy_package|bool) and (step|int == 2)
metadata_settings:
get_attr: [SwiftProxyBase, role_data, metadata_settings]

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

@ -504,28 +504,30 @@ outputs:
- openstack-swift-object
- name: "PreUpgrade step0,validation: Check swift storage services are running"
command: systemctl is-active --quiet "{{ item.item }}"
tags: step0,validation
tags: validation
with_items: "{{ swift_services_enabled.results }}"
when: item.rc == 0
when: (item.rc == 0) and (step|int == 0)
- name: Stop and disable swift storage services
tags: step2
service: name={{ item.item }} state=stopped enabled=no
with_items: "{{ swift_services_enabled.results }}"
when: item.rc == 0
when: (item.rc == 0) and (step|int == 2)
- name: Set fact for removal of openstack-swift-container,object,account package
when: step|int == 2
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
tags: step2
ignore_errors: True
when: {get_param: UpgradeRemoveUnusedPackages}
when: (remove_swift_package|bool) and (step|int == 2)
with_items:
- openstack-swift-container
- openstack-swift-object
- openstack-swift-account
- name: Remove rsync service from xinetd
tags: step2
file: state=absent path=/etc/xinetd.d/rsync
when: step|int == 2
- name: Restart xinetd service after rsync removal
tags: step2
when: step|int == 2
service: name=xinetd state=restarted
update_tasks:
- name: Ensure rsyncd pid file is absent

7
docker/services/tacker.yaml
View File

@ -150,9 +150,8 @@ outputs:
register: tacker_enabled
- name: "PreUpgrade step0,validation: Check if tacker is running"
command: systemctl is-active --quiet openstack-tacker-server
when: tacker_enabled.rc == 0
tags: step0,validation
when: (tacker_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop and disable tacker-server service
tags: step2
when: tacker_enabled.rc == 0
when: (tacker_enabled.rc == 0) and (step|int == 2)
service: name=openstack-tacker-server state=stopped enabled=no

7
docker/services/zaqar.yaml
View File

@ -207,11 +207,10 @@ outputs:
register: httpd_running
- name: "PreUpgrade step0,validation: Check if zaqar_wsgi is running"
shell: systemctl status 'httpd' | grep -q zaqar_wsgi
tags: step0,validation
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
tags: validation
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 0)
- name: Stop and disable zaqar service
tags: step2
when: httpd_enabled.rc == 0 and httpd_running.rc == 0
when: (httpd_enabled.rc == 0) and (httpd_running.rc == 0) and (step|int == 2)
service: name=httpd state=stopped enabled=no
metadata_settings:
get_attr: [ZaqarBase, role_data, metadata_settings]

4
extraconfig/services/kubernetes-master.yaml
View File

@ -63,7 +63,7 @@ outputs:
external_deploy_tasks:
# FIXME: remove this block when kubespray is packaged
- name: kubernetes_master step 2 kubespray repository
when: step == '2'
when: step|int == 2
block:
- name: check kubespray directory existence
stat:
@ -93,7 +93,7 @@ outputs:
# do not overwrite existing contents
when: not kubespray_stat.stat.exists and not kubespray_cloned_stat.stat.exists
- name: kubernetes_master step 2
when: step == '2'
when: step|int == 2
block:
- name: create kubespray temp dirs
file:

32
puppet/services/README.rst
View File

@ -133,6 +133,10 @@ has more details about the expected dictionary.
Batch Upgrade Steps
-------------------
Note: the `upgrade_batch_tasks` are no longer used and deprecated for Queens.
The information below applies to upgrade_batch_tasks as they were used for the
Ocata major upgrade. The `upgrade_batch_tasks` were used exclusively by the
ceph services and for Pike ceph is now configured by ceph-ansible.
Each service template may optionally define a `upgrade_batch_tasks` key, which
is a list of ansible tasks to be performed during the upgrade process.
@ -164,26 +168,15 @@ Each service template may optionally define a `upgrade_tasks` key, which is a
list of ansible tasks to be performed during the upgrade process.
Similar to the step_config, we allow a series of steps for the per-service
upgrade sequence, defined as ansible tasks with a tag e.g "step1" for the first
step, "step2" for the second, etc.
upgrade sequence, defined as ansible tasks with a "when: step|int == 1" for
for the first step, "== 2" for the second, etc.
Steps/tags correlate to the following:
Steps correlate to the following:
1) Stop all control-plane services.
2) Quiesce the control-plane, e.g disable LoadBalancer, stop
pacemaker cluster: this will stop the following resource:
- ocata:
- galera
- rabbit
- redis
- haproxy
- vips
- cinder-volumes
- cinder-backup
- manilla-share
- rbd-mirror
1) Perform any pre-upgrade validations.
2) Stop the control-plane services, e.g disable LoadBalancer, stop
pacemaker cluster and stop any managed resources.
The exact order is controlled by the cluster constraints.
3) Perform a package update and install new packages: A general
@ -205,9 +198,8 @@ Each service template may optionally define a `update_tasks` key, which is a
list of ansible tasks to be performed during the minor update process.
Similar to the upgrade_tasks, we allow a series of steps for the per-service
update sequence, but note update_task selects the steps via a conditional
referencing the step variable e.g when: step == 2, which is different to the
tags based approach used for upgrade_tasks (the two may be aligned in future).
update sequence via conditionals referencing a step variable e.g when:
step|int == 2.
Nova Server Metadata Settings

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

@ -120,5 +120,5 @@ outputs:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Stop aodh_api service (running under httpd)
tags: step1
when: step|int == 1
service: name=httpd state=stopped

7
puppet/services/aodh-evaluator.yaml
View File

@ -63,9 +63,8 @@ outputs:
register: aodh_evaluator_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-evaluator is running"
shell: /usr/bin/systemctl show 'openstack-aodh-evaluator' --property ActiveState | grep '\bactive\b'
when: aodh_evaluator_enabled.rc == 0
tags: step0,validation
when: (aodh_evaluator_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop aodh_evaluator service
tags: step1
when: aodh_evaluator_enabled.rc == 0
when: (aodh_evaluator_enabled.rc == 0) and (step|int == 1)
service: name=openstack-aodh-evaluator state=stopped

7
puppet/services/aodh-listener.yaml
View File

@ -63,9 +63,8 @@ outputs:
register: aodh_listener_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running"
shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b'
when: aodh_listener_enabled.rc == 0
tags: step0,validation
when: (aodh_listener_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop aodh_listener service
tags: step1
when: aodh_listener_enabled.rc == 0
when: (aodh_listener_enabled.rc == 0) and (step|int == 1)
service: name=openstack-aodh-listener state=stopped

7
puppet/services/aodh-notifier.yaml
View File

@ -63,9 +63,8 @@ outputs:
register: aodh_notifier_enabled
- name: "PreUpgrade step0,validation: Check service openstack-aodh-notifier is running"
shell: /usr/bin/systemctl show 'openstack-aodh-notifier' --property ActiveState | grep '\bactive\b'
when: aodh_notifier_enabled.rc == 0
tags: step0,validation
when: (aodh_notifier_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop aodh_notifier service
tags: step1
when: aodh_notifier_enabled.rc == 0
when: (aodh_notifier_enabled.rc == 0) and (step|int == 1)
service: name=openstack-aodh-notifier state=stopped

6
puppet/services/apache.yaml
View File

@ -131,8 +131,8 @@ outputs:
register: httpd_enabled
- name: "PreUpgrade step0,validation: Check service httpd is running"
shell: /usr/bin/systemctl show 'httpd' --property ActiveState | grep '\bactive\b'
when: httpd_enabled.rc == 0
tags: step0,validation
when: (httpd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Ensure mod_ssl package is installed
tags: step3
when: step|int == 3
yum: name=mod_ssl state=latest

7
puppet/services/auditd.yaml
View File

@ -54,9 +54,8 @@ outputs:
shell: >
/usr/bin/systemctl show 'auditd' --property ActiveState |
grep '\bactive\b'
when: auditd_enabled.rc == 0
tags: step0,validation
when: (auditd_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop auditd service
tags: step2
when: auditd_enabled.rc == 0
when: (auditd_enabled.rc == 0) and (step|int == 2)
service: name=auditd state=stopped

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

@ -209,9 +209,8 @@ outputs:
register: barbican_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-barbican-api is running"
shell: /usr/bin/systemctl show 'openstack-barbican-api' --property ActiveState | grep '\bactive\b'
when: barbican_api_enabled.rc == 0
tags: step0,validation
when: (barbican_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Install openstack-barbican-api package if it was disabled
tags: step3
yum: name=openstack-barbican-api state=latest
when: barbican_api_enabled.rc != 0
when: (barbican_api_enabled.rc != 0) and (step|int == 3)

7
puppet/services/ceilometer-agent-central.yaml
View File

@ -80,9 +80,8 @@ outputs:
register: ceilometer_agent_central_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
when: ceilometer_agent_central_enabled.rc == 0
tags: step0,validation
when: (ceilometer_agent_central_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop ceilometer_agent_central service
tags: step1
when: ceilometer_agent_central_enabled.rc == 0
when: (ceilometer_agent_central_enabled.rc == 0) and (step|int == 1)
service: name=openstack-ceilometer-central state=stopped

7
puppet/services/ceilometer-agent-compute.yaml
View File

@ -79,9 +79,8 @@ outputs:
register: ceilometer_agent_compute_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
when: ceilometer_agent_compute_enabled.rc == 0
tags: step0,validation
when: (ceilometer_agent_compute_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop ceilometer_agent_compute service
tags: step1
when: ceilometer_agent_compute_enabled.rc == 0
when: (ceilometer_agent_compute_enabled.rc == 0) and (step|int == 1)
service: name=openstack-ceilometer-compute state=stopped

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

@ -80,13 +80,11 @@ outputs:
shell: >
/usr/bin/systemctl show 'openstack-ceilometer-ipmi' --property ActiveState |
grep '\bactive\b'
when: ceilometer_ipmi_enabled.rc == 0
tags: step0,validation
when: (ceilometer_ipmi_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop openstack-ceilometer-ipmi service
tags: step1
when: ceilometer_ipmi_enabled.rc == 0
when: (ceilometer_ipmi_enabled.rc == 0) and (step|int == 1)
service: name=openstack-ceilometer-ipmi state=stopped
- name: Install openstack-ceilometer-ipmi package if it was disabled
tags: step3
yum: name=openstack-ceilometer-ipmi state=latest
when: ceilometer_ipmi_enabled.rc != 0
when: (ceilometer_ipmi_enabled.rc != 0) and (step|int == 3)

7
puppet/services/ceilometer-agent-notification.yaml
View File

@ -74,9 +74,8 @@ outputs:
register: ceilometer_agent_notification_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-notification is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-notification' --property ActiveState | grep '\bactive\b'
when: ceilometer_agent_notification_enabled.rc == 0
tags: step0,validation
when: (ceilometer_agent_notification_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop ceilometer_agent_notification service
tags: step1
when: ceilometer_agent_notification_enabled.rc == 0
when: (ceilometer_agent_notification_enabled.rc == 0) and (step|int == 1)
service: name=openstack-ceilometer-notification state=stopped

11
puppet/services/ceph-mon.yaml
View File

@ -152,31 +152,31 @@ outputs:
step_config: |
include ::tripleo::profile::base::ceph::mon
upgrade_batch_tasks:
# NOTE: upgrade_batch_tasks are deprecated in Queens.
# Note we perform these tasks in list order, but they are all step0 so
# we can perform a rolling upgrade of all mon nodes in step0, then a
# rolling upgrade of all osd nodes in step1
- when: step|int == 0
block:
- name: Check status
tags: step0,validation
tags: validation
shell: ceph health | egrep -sq "HEALTH_OK|HEALTH_WARN"
- name: Stop CephMon
tags: step0
service:
name: ceph-mon@{{ ansible_hostname }}
state: stopped
- name: Update Ceph packages
tags: step0
yum:
name: ceph-mon
state: latest
- name: Start CephMon
tags: step0
service:
name: ceph-mon@{{ ansible_hostname }}
state: started
# ceph-ansible
# https://github.com/ceph/ceph-ansible/blob/master/infrastructure-playbooks/rolling_update.yml#L149-L157
- name: Wait for the monitor to join the quorum...
tags: step0,ceph_quorum_validation
tags: ceph_quorum_validation
shell: |
ceph -s | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
register: ceph_quorum_nodecheck
@ -184,5 +184,4 @@ outputs:
retries: {get_param: CephValidationRetries}
delay: {get_param: CephValidationDelay}
- name: ceph osd crush tunables default
tags: step0
shell: ceph osd crush tunables default

19
puppet/services/ceph-osd.yaml
View File

@ -79,39 +79,34 @@ outputs:
step_config: |
include ::tripleo::profile::base::ceph::osd
upgrade_batch_tasks:
# NOTE: upgrade_batch_tasks are deprecated in Queens.
- when: step|int == 1
block:
- name: Check status
tags: step1,validation
tags: validation
shell: ceph health | grep -qv HEALTH_ERR
- name: Get OSD IDs
tags: step1
shell: ls /var/lib/ceph/osd | awk 'BEGIN { FS = "-" } ; { print $2 }'
register: osd_ids
# "so that mirrors aren't rebalanced as if the OSD died" - gfidente / leseb
- name: ceph osd set noout
tags: step1
command: ceph osd set noout
- name: ceph osd set norebalance
tags: step1
command: ceph osd set norebalance
- name: ceph osd set nodeep-scrub
tags: step1
command: ceph osd set nodeep-scrub
- name: ceph osd set noscrub
tags: step1
command: ceph osd set noscrub
- name: Stop CephOSD
tags: step1
service:
name: ceph-osd@{{ item }}
state: stopped
with_items: "{{osd_ids.stdout.strip().split()}}"
- name: Update Ceph packages
tags: step1
yum:
name: ceph-osd
state: latest
- name: Start CephOSD
tags: step1
service:
name: ceph-osd@{{ item }}
state: started
@ -119,7 +114,7 @@ outputs:
# with awk we are meant to check if $2 and $4 are *the same* but it returns 1 when
# they are, so the check is inverted to produce an useful exit code
- name: Wait for clean pgs...
tags: step1,ceph_pgs_clean_validation
tags: ceph_pgs_clean_validation
vars:
ignore_warnings: {get_param: IgnoreCephUpgradeWarnings}
shell: |
@ -131,14 +126,10 @@ outputs:
when:
- not ignore_warnings
- name: ceph osd unset noout
tags: step1
command: ceph osd unset noout
- name: ceph osd unset norebalance
tags: step1
command: ceph osd unset norebalance
- name: ceph osd unset nodeep-scrub
tags: step1
command: ceph osd unset nodeep-scrub
- name: ceph osd unset noscrub
tags: step1
command: ceph osd unset noscrub

7
puppet/services/ceph-rgw.yaml
View File

@ -104,11 +104,10 @@ outputs:
register: ceph_rgw_enabled
- name: Check status
shell: /usr/bin/systemctl show ceph-radosgw@{{rgw_id.stdout}} --property ActiveState | grep '\bactive\b'
when: ceph_rgw_enabled.rc == 0
tags: step0,validation
when: (ceph_rgw_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop RGW instance
tags: step1
when: ceph_rgw_enabled.rc == 0
when: (ceph_rgw_enabled.rc == 0) and (step|int == 1)
service:
name: ceph-radosgw@{{rgw_id.stdout}}
state: stopped

12
puppet/services/cinder-api.yaml
View File

@ -194,18 +194,16 @@ outputs:
register: cinder_api_enabled
- name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
when: cinder_api_enabled.rc == 0
tags: step0,validation
when: (cinder_api_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: check for cinder running under apache (post upgrade)
tags: step1
when: step|int == 1
shell: "httpd -t -D DUMP_VHOSTS | grep -q cinder"
register: cinder_apache
ignore_errors: true
- name: Stop cinder_api service (running under httpd)
tags: step1
service: name=httpd state=stopped
when: cinder_apache.rc == 0
when: (cinder_apache.rc == 0) and (step|int == 1)
- name: Stop and disable cinder_api service (pre-upgrade not under httpd)
tags: step1
when: cinder_api_enabled.rc == 0
when: (cinder_api_enabled.rc == 0) and (step|int == 1)
service: name=openstack-cinder-api state=stopped enabled=no

7
puppet/services/cinder-scheduler.yaml
View File

@ -74,9 +74,8 @@ outputs:
register: cinder_scheduler_enabled
- name: "PreUpgrade step0,validation: Check service openstack-cinder-scheduler is running"
shell: /usr/bin/systemctl show 'openstack-cinder-scheduler' --property ActiveState | grep '\bactive\b'
when: cinder_scheduler_enabled.rc == 0
tags: step0,validation
when: (cinder_scheduler_enabled.rc == 0) and (step|int == 0)
tags: validation
- name: Stop cinder_scheduler service
tags: step1
when: cinder_scheduler_enabled.rc == 0
when: (cinder_scheduler_enabled.rc == 0) and (step|int == 1)
service: name=openstack-cinder-scheduler state=stopped

Some files were not shown because too many files have changed in this diff Show More