Adds a pre-upgrade check that service is running (step0)

Adds a step0 for most services to check that the state is running
before continuing with any of the other upgrades steps (these are
tagged step0).

You can skip this service check by overriding the
SkipUpgradeConfigTags parameter as follows:

parameter_defaults:
  SkipUpgradeConfigTags: validation

Co-Authored-By: Steven Hardy <shardy@redhat.com>
Change-Id: Ie276f153015f671b720b6ed5beaac1b921661909
This commit is contained in:
marios 2016-12-23 16:07:44 +02:00
parent 91a231d808
commit d14c56e1b6
30 changed files with 92 additions and 1 deletions

View File

@ -86,6 +86,9 @@ outputs:
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-aodh-api is running"
shell: /usr/bin/systemctl show 'openstack-aodh-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop aodh_api service (running under httpd) - name: Stop aodh_api service (running under httpd)
tags: step2 tags: step2
service: name=httpd state=stopped service: name=httpd state=stopped

View File

@ -41,6 +41,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::aodh::evaluator include tripleo::profile::base::aodh::evaluator
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-aodh-evaluator is running"
shell: /usr/bin/systemctl show 'openstack-aodh-evaluator' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop aodh_evaluator service - name: Stop aodh_evaluator service
tags: step2 tags: step2
service: name=openstack-aodh-evaluator state=stopped service: name=openstack-aodh-evaluator state=stopped

View File

@ -41,6 +41,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::aodh::listener include tripleo::profile::base::aodh::listener
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running"
shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop aodh_listener service - name: Stop aodh_listener service
tags: step2 tags: step2
service: name=openstack-aodh-listener state=stopped service: name=openstack-aodh-listener state=stopped

View File

@ -41,6 +41,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::aodh::notifier include tripleo::profile::base::aodh::notifier
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-aodh-notifier is running"
shell: /usr/bin/systemctl show 'openstack-aodh-notifier' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop aodh_notifier service - name: Stop aodh_notifier service
tags: step2 tags: step2
service: name=openstack-aodh-notifier state=stopped service: name=openstack-aodh-notifier state=stopped

View File

@ -63,3 +63,7 @@ outputs:
type: node type: node
for_each: for_each:
$NETWORK: {get_attr: [ApacheNetworks, value]} $NETWORK: {get_attr: [ApacheNetworks, value]}
upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service httpd is running"
shell: /usr/bin/systemctl show 'httpd' --property ActiveState | grep '\bactive\b'
tags: step0,validation

View File

@ -66,3 +66,7 @@ outputs:
- "%{hiera('apache_remote_proxy_ips_network')}" - "%{hiera('apache_remote_proxy_ips_network')}"
metadata_settings: metadata_settings:
get_attr: [ApacheTLS, role_data, metadata_settings] get_attr: [ApacheTLS, role_data, metadata_settings]
upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service httpd is running"
shell: /usr/bin/systemctl show 'httpd' --property ActiveState | grep '\bactive\b'
tags: step0,validation

View File

@ -146,3 +146,7 @@ outputs:
get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix] get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix]
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-barbican-api is running"
shell: /usr/bin/systemctl show 'openstack-barbican-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation

View File

@ -55,6 +55,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::agent::central include ::tripleo::profile::base::ceilometer::agent::central
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop ceilometer_agent_central service - name: Stop ceilometer_agent_central service
tags: step2 tags: step2
service: name=openstack-ceilometer-central state=stopped service: name=openstack-ceilometer-central state=stopped

View File

@ -49,6 +49,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::agent::compute include ::tripleo::profile::base::ceilometer::agent::compute
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop ceilometer_agent_compute service - name: Stop ceilometer_agent_compute service
tags: step2 tags: step2
service: name=openstack-ceilometer-compute state=stopped service: name=openstack-ceilometer-compute state=stopped

View File

@ -50,6 +50,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::agent::notification include ::tripleo::profile::base::ceilometer::agent::notification
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-notification is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-notification' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop ceilometer_agent_notification service - name: Stop ceilometer_agent_notification service
tags: step2 tags: step2
service: name=openstack-ceilometer-notification state=stopped service: name=openstack-ceilometer-notification state=stopped

View File

@ -93,6 +93,9 @@ outputs:
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-api is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop ceilometer_api service (running under httpd) - name: Stop ceilometer_api service (running under httpd)
tags: step2 tags: step2
service: name=httpd state=stopped service: name=httpd state=stopped

View File

@ -60,6 +60,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::collector include ::tripleo::profile::base::ceilometer::collector
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-collector is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-collector' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop ceilometer_collector service - name: Stop ceilometer_collector service
tags: step2 tags: step2
service: name=openstack-ceilometer-collector state=stopped service: name=openstack-ceilometer-collector state=stopped

View File

@ -40,3 +40,7 @@ outputs:
get_attr: [CeilometerServiceBase, role_data, config_settings] get_attr: [CeilometerServiceBase, role_data, config_settings]
step_config: | step_config: |
include ::tripleo::profile::base::ceilometer::expirer include ::tripleo::profile::base::ceilometer::expirer
upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-expirer is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-expirer' --property ActiveState | grep '\bactive\b'
tags: step0,validation

View File

@ -149,7 +149,7 @@ outputs:
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0: Check service openstack-cinder-api is running" - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running"
shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b' shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation tags: step0,validation
- name: check for cinder running under apache (post upgrade) - name: check for cinder running under apache (post upgrade)

View File

@ -52,6 +52,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::cinder::scheduler include ::tripleo::profile::base::cinder::scheduler
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-cinder-scheduler is running"
shell: /usr/bin/systemctl show 'openstack-cinder-scheduler' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop cinder_scheduler service - name: Stop cinder_scheduler service
tags: step2 tags: step2
service: name=openstack-cinder-scheduler state=stopped service: name=openstack-cinder-scheduler state=stopped

View File

@ -116,6 +116,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-cinder-volume is running"
shell: /usr/bin/systemctl show 'openstack-cinder-volume' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop cinder_volume service - name: Stop cinder_volume service
tags: step2 tags: step2
service: name=openstack-cinder-volume state=stopped service: name=openstack-cinder-volume state=stopped

View File

@ -138,6 +138,9 @@ outputs:
service_config_settings: service_config_settings:
get_attr: [GlanceBase, role_data, service_config_settings] get_attr: [GlanceBase, role_data, service_config_settings]
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-glance-api is running"
shell: /usr/bin/systemctl show 'openstack-glance-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop glance_api service - name: Stop glance_api service
tags: step2 tags: step2
service: name=openstack-glance-api state=stopped service: name=openstack-glance-api state=stopped

View File

@ -134,6 +134,9 @@ outputs:
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-api is running"
shell: /usr/bin/systemctl show 'openstack-gnocchi-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop gnocchi_api service (running under httpd) - name: Stop gnocchi_api service (running under httpd)
tags: step2 tags: step2
service: name=httpd state=stopped service: name=httpd state=stopped

View File

@ -47,6 +47,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::gnocchi::metricd include ::tripleo::profile::base::gnocchi::metricd
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-metricd is running"
shell: /usr/bin/systemctl show 'openstack-gnocchi-metricd' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop gnocchi_metricd service - name: Stop gnocchi_metricd service
tags: step2 tags: step2
service: name=openstack-gnocchi-metricd state=stopped service: name=openstack-gnocchi-metricd state=stopped

View File

@ -46,6 +46,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::gnocchi::statsd include ::tripleo::profile::base::gnocchi::statsd
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-gnocchi-statsd is running"
shell: /usr/bin/systemctl show 'openstack-gnocchi-statsd' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop gnocchi_statsd service - name: Stop gnocchi_statsd service
tags: step2 tags: step2
service: name=openstack-gnocchi-statsd state=stopped service: name=openstack-gnocchi-statsd state=stopped

View File

@ -78,6 +78,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::haproxy include ::tripleo::profile::base::haproxy
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service haproxy is running"
shell: /usr/bin/systemctl show 'haproxy' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop haproxy service - name: Stop haproxy service
tags: step1 tags: step1
service: name=haproxy state=stopped service: name=haproxy state=stopped

View File

@ -85,6 +85,9 @@ outputs:
heat::keystone::auth_cfn::password: {get_param: HeatPassword} heat::keystone::auth_cfn::password: {get_param: HeatPassword}
heat::keystone::auth_cfn::region: {get_param: KeystoneRegion} heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-heat-api-cfn is running"
shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop heat_api_cfn service - name: Stop heat_api_cfn service
tags: step2 tags: step2
service: name=openstack-heat-api-cfn state=stopped service: name=openstack-heat-api-cfn state=stopped

View File

@ -67,6 +67,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::heat::api_cloudwatch include ::tripleo::profile::base::heat::api_cloudwatch
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-heat-api-cloudwatch is running"
shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop heat_api_cloudwatch service - name: Stop heat_api_cloudwatch service
tags: step2 tags: step2
service: name=openstack-heat-api-cloudwatch state=stopped service: name=openstack-heat-api-cloudwatch state=stopped

View File

@ -85,6 +85,9 @@ outputs:
heat::keystone::auth::password: {get_param: HeatPassword} heat::keystone::auth::password: {get_param: HeatPassword}
heat::keystone::auth::region: {get_param: KeystoneRegion} heat::keystone::auth::region: {get_param: KeystoneRegion}
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-heat-api is running"
shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop heat_api service - name: Stop heat_api service
tags: step2 tags: step2
service: name=openstack-heat-api state=stopped service: name=openstack-heat-api state=stopped

View File

@ -138,6 +138,9 @@ outputs:
# This is needed because the keystone profile handles creating the domain # This is needed because the keystone profile handles creating the domain
tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword} tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword}
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service openstack-heat-engine is running"
shell: echo o/ #TODO uncomment when /#/c/423302/ : /usr/bin/systemctl show 'openstack-heat-engine' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop heat_engine service - name: Stop heat_engine service
tags: step2 tags: step2
service: name=openstack-heat-engine state=stopped service: name=openstack-heat-engine state=stopped

View File

@ -161,6 +161,9 @@ outputs:
- '%' - '%'
- "%{hiera('mysql_bind_host')}" - "%{hiera('mysql_bind_host')}"
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service neutron-server is running"
shell: /usr/bin/systemctl show 'neutron-server' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop neutron_api service - name: Stop neutron_api service
tags: step2 tags: step2
service: name=neutron-server state=stopped service: name=neutron-server state=stopped

View File

@ -80,6 +80,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::neutron::dhcp include tripleo::profile::base::neutron::dhcp
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service neutron-dhcp-agent is running"
shell: /usr/bin/systemctl show 'neutron-dhcp-agent' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop neutron_dhcp service - name: Stop neutron_dhcp service
tags: step2 tags: step2
service: name=neutron-dhcp-agent state=stopped service: name=neutron-dhcp-agent state=stopped

View File

@ -80,6 +80,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::neutron::l3 include tripleo::profile::base::neutron::l3
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running"
shell: /usr/bin/systemctl show 'neutron-l3-agent' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop neutron_l3 service - name: Stop neutron_l3 service
tags: step2 tags: step2
service: name=neutron-l3-agent state=stopped service: name=neutron-l3-agent state=stopped

View File

@ -76,6 +76,9 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::neutron::metadata include tripleo::profile::base::neutron::metadata
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service neutron-metadata-agent is running"
shell: /usr/bin/systemctl show 'neutron-metadata-agent' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop neutron_metadata service - name: Stop neutron_metadata service
tags: step2 tags: step2
service: name=neutron-metadata-agent state=stopped service: name=neutron-metadata-agent state=stopped

View File

@ -121,6 +121,9 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::neutron::ovs include ::tripleo::profile::base::neutron::ovs
upgrade_tasks: upgrade_tasks:
- name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
tags: step0,validation
- name: Stop neutron_ovs_agent service - name: Stop neutron_ovs_agent service
tags: step2 tags: step2
service: name=neutron-openvswitch-agent state=stopped service: name=neutron-openvswitch-agent state=stopped