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

2017-01-27 12:58:03 +00:00 · 2017-01-27 12:58:03 +00:00 · c349789089
parent ef741fab9b d14c56e1b6
commit c349789089
30 changed files with 92 additions and 1 deletions
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@ -86,6 +86,9 @@ outputs:
      metadata_settings:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      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)
          tags: step2
          service: name=httpd state=stopped
--- a/puppet/services/aodh-evaluator.yaml
+++ b/puppet/services/aodh-evaluator.yaml
@ -41,6 +41,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::aodh::evaluator
      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
          tags: step2
          service: name=openstack-aodh-evaluator state=stopped
--- a/puppet/services/aodh-listener.yaml
+++ b/puppet/services/aodh-listener.yaml
@ -41,6 +41,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::aodh::listener
      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
          tags: step2
          service: name=openstack-aodh-listener state=stopped
--- a/puppet/services/aodh-notifier.yaml
+++ b/puppet/services/aodh-notifier.yaml
@ -41,6 +41,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::aodh::notifier
      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
          tags: step2
          service: name=openstack-aodh-notifier state=stopped
--- a/puppet/services/apache-internal-tls-certmonger.yaml
+++ b/puppet/services/apache-internal-tls-certmonger.yaml
@ -63,3 +63,7 @@ outputs:
              type: node
          for_each:
            $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
--- a/puppet/services/apache.yaml
+++ b/puppet/services/apache.yaml
@ -66,3 +66,7 @@ outputs:
              - "%{hiera('apache_remote_proxy_ips_network')}"
      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
--- a/puppet/services/barbican-api.yaml
+++ b/puppet/services/barbican-api.yaml
@ -146,3 +146,7 @@ outputs:
            get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix]
      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
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@ -55,6 +55,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::ceilometer::agent::central
      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
          tags: step2
          service: name=openstack-ceilometer-central state=stopped
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@ -49,6 +49,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::ceilometer::agent::compute
      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
          tags: step2
          service: name=openstack-ceilometer-compute state=stopped
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/puppet/services/ceilometer-agent-notification.yaml
@ -50,6 +50,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::ceilometer::agent::notification
      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
          tags: step2
          service: name=openstack-ceilometer-notification state=stopped
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@ -93,6 +93,9 @@ outputs:
      metadata_settings:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      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)
          tags: step2
          service: name=httpd state=stopped
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@ -60,6 +60,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::ceilometer::collector
      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
          tags: step2
          service: name=openstack-ceilometer-collector state=stopped
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@ -40,3 +40,7 @@ outputs:
        get_attr: [CeilometerServiceBase, role_data, config_settings]
      step_config: |
        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
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@ -149,7 +149,7 @@ outputs:
      metadata_settings:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      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'
          tags: step0,validation
        - name: check for cinder running under apache (post upgrade)
--- a/puppet/services/cinder-scheduler.yaml
+++ b/puppet/services/cinder-scheduler.yaml
@ -52,6 +52,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::cinder::scheduler
      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
          tags: step2
          service: name=openstack-cinder-scheduler state=stopped
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@ -116,6 +116,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::cinder::volume
      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
          tags: step2
          service: name=openstack-cinder-volume state=stopped
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@ -138,6 +138,9 @@ outputs:
      service_config_settings:
        get_attr: [GlanceBase, role_data, service_config_settings]
      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
          tags: step2
          service: name=openstack-glance-api state=stopped
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@ -134,6 +134,9 @@ outputs:
      metadata_settings:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      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)
          tags: step2
          service: name=httpd state=stopped
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/puppet/services/gnocchi-metricd.yaml
@ -47,6 +47,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::gnocchi::metricd
      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
          tags: step2
          service: name=openstack-gnocchi-metricd state=stopped
--- a/puppet/services/gnocchi-statsd.yaml
+++ b/puppet/services/gnocchi-statsd.yaml
@ -46,6 +46,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::gnocchi::statsd
      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
          tags: step2
          service: name=openstack-gnocchi-statsd state=stopped
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@ -78,6 +78,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::haproxy
      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
          tags: step1
          service: name=haproxy state=stopped
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@ -85,6 +85,9 @@ outputs:
              heat::keystone::auth_cfn::password: {get_param: HeatPassword}
              heat::keystone::auth_cfn::region: {get_param: KeystoneRegion}
      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
          tags: step2
          service: name=openstack-heat-api-cfn state=stopped
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/puppet/services/heat-api-cloudwatch.yaml
@ -67,6 +67,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::heat::api_cloudwatch
      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
          tags: step2
          service: name=openstack-heat-api-cloudwatch state=stopped
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@ -85,6 +85,9 @@ outputs:
              heat::keystone::auth::password: {get_param: HeatPassword}
              heat::keystone::auth::region: {get_param: KeystoneRegion}
      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
          tags: step2
          service: name=openstack-heat-api state=stopped
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@ -138,6 +138,9 @@ outputs:
            # This is needed because the keystone profile handles creating the domain
            tripleo::profile::base::keystone::heat_admin_password: {get_param: HeatStackDomainAdminPassword}
      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
          tags: step2
          service: name=openstack-heat-engine state=stopped
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@ -161,6 +161,9 @@ outputs:
            - '%'
            - "%{hiera('mysql_bind_host')}"
      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
          tags: step2
          service: name=neutron-server state=stopped
--- a/puppet/services/neutron-dhcp.yaml
+++ b/puppet/services/neutron-dhcp.yaml
@ -80,6 +80,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::neutron::dhcp
      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
          tags: step2
          service: name=neutron-dhcp-agent state=stopped
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@ -80,6 +80,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::neutron::l3
      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
          tags: step2
          service: name=neutron-l3-agent state=stopped
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@ -76,6 +76,9 @@ outputs:
      step_config: |
        include tripleo::profile::base::neutron::metadata
      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
          tags: step2
          service: name=neutron-metadata-agent state=stopped
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@ -121,6 +121,9 @@ outputs:
      step_config: |
        include ::tripleo::profile::base::neutron::ovs
      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
          tags: step2
          service: name=neutron-openvswitch-agent state=stopped