Merge "Put service stop at step1 and quiesce at step2."

2017-03-01 10:09:53 +00:00 · 2017-03-01 10:09:53 +00:00 · 6c8f5017d7
commit 6c8f5017d7
parent d8aa952a75 fb78213782
49 changed files with 67 additions and 54 deletions
--- a/puppet/services/README.rst
+++ b/puppet/services/README.rst
@ -100,9 +100,22 @@ step, "step2" for the second, etc.

   Steps/tages correlate to the following:

-   1) Quiesce the control-plane, e.g disable LoadBalancer, stop pacemaker cluster
+   1) Stop all control-plane services.

-   2) Stop all control-plane services, ready for upgrade
+   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
+
+      The exact order is controlled by the cluster constraints.

   3) Perform a package update and install new packages: A general
      upgrade is done, and only new package should go into service
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@ -87,5 +87,5 @@ outputs:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      upgrade_tasks:
        - name: Stop aodh_api service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
--- a/puppet/services/aodh-evaluator.yaml
+++ b/puppet/services/aodh-evaluator.yaml
@ -45,5 +45,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-aodh-evaluator' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop aodh_evaluator service
-          tags: step2
+          tags: step1
          service: name=openstack-aodh-evaluator state=stopped
--- a/puppet/services/aodh-listener.yaml
+++ b/puppet/services/aodh-listener.yaml
@ -45,5 +45,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop aodh_listener service
-          tags: step2
+          tags: step1
          service: name=openstack-aodh-listener state=stopped
--- a/puppet/services/aodh-notifier.yaml
+++ b/puppet/services/aodh-notifier.yaml
@ -45,5 +45,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-aodh-notifier' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop aodh_notifier service
-          tags: step2
+          tags: step1
          service: name=openstack-aodh-notifier state=stopped
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@ -60,5 +60,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop ceilometer_agent_central service
-          tags: step2
+          tags: step1
          service: name=openstack-ceilometer-central state=stopped
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@ -54,5 +54,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop ceilometer_agent_compute service
-          tags: step2
+          tags: step1
          service: name=openstack-ceilometer-compute state=stopped
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/puppet/services/ceilometer-agent-notification.yaml
@ -54,5 +54,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-ceilometer-notification' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop ceilometer_agent_notification service
-          tags: step2
+          tags: step1
          service: name=openstack-ceilometer-notification state=stopped
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@ -94,5 +94,5 @@ outputs:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      upgrade_tasks:
        - name: Stop ceilometer_api service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@ -64,5 +64,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-ceilometer-collector' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop ceilometer_collector service
-          tags: step2
+          tags: step1
          service: name=openstack-ceilometer-collector state=stopped
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@ -154,14 +154,14 @@ outputs:
          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)
-          tags: step2
+          tags: step1
          shell: "apachectl -t -D DUMP_VHOSTS | grep -q cinder"
          register: cinder_apache
          ignore_errors: true
        - name: Stop cinder_api service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
          when: "cinder_apache.rc == 0"
        - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
-          tags: step2
+          tags: step1
          service: name=openstack-cinder-api state=stopped enabled=no
--- a/puppet/services/cinder-scheduler.yaml
+++ b/puppet/services/cinder-scheduler.yaml
@ -56,5 +56,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-cinder-scheduler' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop cinder_scheduler service
-          tags: step2
+          tags: step1
          service: name=openstack-cinder-scheduler state=stopped
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@ -120,5 +120,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-cinder-volume' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop cinder_volume service
-          tags: step2
+          tags: step1
          service: name=openstack-cinder-volume state=stopped
--- a/puppet/services/congress.yaml
+++ b/puppet/services/congress.yaml
@ -101,5 +101,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-congress-server' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop congress service
-          tags: step2
+          tags: step1
          service: name=openstack-congress-server state=stopped
--- a/puppet/services/disabled/glance-registry.yaml
+++ b/puppet/services/disabled/glance-registry.yaml
@ -26,5 +26,5 @@ outputs:
      service_name: glance_registry
      upgrade_tasks:
        - name: Stop and disable glance_registry service on upgrade
-          tags: step2
+          tags: step1
          service: name=openstack-glance-registry state=stopped enabled=no
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@ -141,8 +141,8 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-glance-api' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop glance_api service
-          tags: step2
+          tags: step1
          service: name=openstack-glance-api state=stopped
        - name: Stop and disable glance registry (removed for Ocata)
-          tags: step2
+          tags: step1
          service: name=openstack-glance-registry state=stopped enabled=no
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@ -129,5 +129,5 @@ outputs:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
      upgrade_tasks:
        - name: Stop gnocchi_api service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/puppet/services/gnocchi-metricd.yaml
@ -51,5 +51,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-gnocchi-metricd' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop gnocchi_metricd service
-          tags: step2
+          tags: step1
          service: name=openstack-gnocchi-metricd state=stopped
--- a/puppet/services/gnocchi-statsd.yaml
+++ b/puppet/services/gnocchi-statsd.yaml
@ -50,5 +50,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-gnocchi-statsd' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop gnocchi_statsd service
-          tags: step2
+          tags: step1
          service: name=openstack-gnocchi-statsd state=stopped
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@ -82,7 +82,7 @@ outputs:
          shell: /usr/bin/systemctl show 'haproxy' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop haproxy service
-          tags: step1
+          tags: step2
          service: name=haproxy state=stopped
        - name: Start haproxy service
          tags: step4 # Needed at step 4 for mysql
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@ -89,5 +89,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop heat_api_cfn service
-          tags: step2
+          tags: step1
          service: name=openstack-heat-api-cfn state=stopped
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/puppet/services/heat-api-cloudwatch.yaml
@ -71,5 +71,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop heat_api_cloudwatch service
-          tags: step2
+          tags: step1
          service: name=openstack-heat-api-cloudwatch state=stopped
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@ -89,5 +89,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop heat_api service
-          tags: step2
+          tags: step1
          service: name=openstack-heat-api state=stopped
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@ -141,5 +141,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-heat-engine' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop heat_engine service
-          tags: step2
+          tags: step1
          service: name=openstack-heat-engine state=stopped
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@ -110,5 +110,5 @@ outputs:
          when: httpd_enabled.rc == 0
          tags: step0,validation
        - name: Stop Horizon (under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@ -88,5 +88,5 @@ outputs:
            - "%{hiera('mysql_bind_host')}"
      upgrade_tasks:
        - name: Stop ironic_api service
-          tags: step2
+          tags: step1
          service: name=openstack-ironic-api state=stopped
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@ -109,5 +109,5 @@ outputs:
        include ::tripleo::profile::base::ironic::conductor
      upgrade_tasks:
        - name: Stop ironic_conductor service
-          tags: step2
+          tags: step1
          service: name=openstack-ironic-conductor state=stopped
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@ -308,7 +308,7 @@ outputs:
      # Ansible tasks to handle upgrade
      upgrade_tasks:
        - name: Stop keystone service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
      metadata_settings:
        get_attr: [ApacheServiceBase, role_data, metadata_settings]
--- a/puppet/services/logging/fluentd-client.yaml
+++ b/puppet/services/logging/fluentd-client.yaml
@ -69,5 +69,5 @@ outputs:
            grep '\bactive\b'
          tags: step0,validation
        - name: Stop fluentd service
-          tags: step2
+          tags: step1
          service: name=fluentd state=stopped
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@ -116,5 +116,5 @@ outputs:
            grep '\bactive\b'
          tags: step0,validation
        - name: Stop collectd service
-          tags: step2
+          tags: step1
          service: name=collectd state=stopped
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@ -69,5 +69,5 @@ outputs:
            grep '\bactive\b'
          tags: step0,validation
        - name: Stop sensu-client service
-          tags: step2
+          tags: step1
          service: name=sensu-client state=stopped
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@ -193,5 +193,5 @@ outputs:
          shell: /usr/bin/systemctl show 'neutron-server' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop neutron_api service
-          tags: step2
+          tags: step1
          service: name=neutron-server state=stopped
--- a/puppet/services/neutron-dhcp.yaml
+++ b/puppet/services/neutron-dhcp.yaml
@ -84,5 +84,5 @@ outputs:
          shell: /usr/bin/systemctl show 'neutron-dhcp-agent' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop neutron_dhcp service
-          tags: step2
+          tags: step1
          service: name=neutron-dhcp-agent state=stopped
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@ -89,5 +89,5 @@ outputs:
          shell: /usr/bin/systemctl show 'neutron-l3-agent' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop neutron_l3 service
-          tags: step2
+          tags: step1
          service: name=neutron-l3-agent state=stopped
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@ -80,5 +80,5 @@ outputs:
          shell: /usr/bin/systemctl show 'neutron-metadata-agent' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop neutron_metadata service
-          tags: step2
+          tags: step1
          service: name=neutron-metadata-agent state=stopped
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@ -125,5 +125,5 @@ outputs:
          shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop neutron_ovs_agent service
-          tags: step2
+          tags: step1
          service: name=neutron-openvswitch-agent state=stopped
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@ -152,7 +152,7 @@ outputs:
          collectd::plugins::virt::connection: "qemu:///system"
      upgrade_tasks:
        - name: Stop nova-compute service
-          tags: step2
+          tags: step1
          service: name=openstack-nova-compute state=stopped
        # If not already set by puppet (e.g a pre-ocata version), set the
        # upgrade_level for compute to "auto"
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@ -67,12 +67,12 @@ outputs:
        include tripleo::profile::base::nova::conductor
      upgrade_tasks:
        - name: Stop nova_conductor service
-          tags: step2
+          tags: step1
          service: name=openstack-nova-conductor state=stopped
        # If not already set by puppet (e.g a pre-ocata version), set the
        # upgrade_level for compute to "auto"
        - name: Set compute upgrade level to auto
-          tags: step2
+          tags: step1
          ini_file:
            str_replace:
              template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
--- a/puppet/services/nova-consoleauth.yaml
+++ b/puppet/services/nova-consoleauth.yaml
@ -50,5 +50,5 @@ outputs:
        include tripleo::profile::base::nova::consoleauth
      upgrade_tasks:
        - name: Stop nova_consoleauth service
-          tags: step2
+          tags: step1
          service: name=openstack-nova-consoleauth state=stopped
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@ -124,7 +124,7 @@ outputs:
              - "%{hiera('mysql_bind_host')}"
      upgrade_tasks:
        - name: Stop nova_placement service (running under httpd)
-          tags: step2
+          tags: step1
          service: name=httpd state=stopped
        # The nova placement API isn't installed in newton images, so install
        # it on upgrade
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@ -65,5 +65,5 @@ outputs:
        include tripleo::profile::base::nova::scheduler
      upgrade_tasks:
        - name: Stop nova_scheduler service
-          tags: step2
+          tags: step1
          service: name=openstack-nova-scheduler state=stopped
--- a/puppet/services/nova-vnc-proxy.yaml
+++ b/puppet/services/nova-vnc-proxy.yaml
@ -66,5 +66,5 @@ outputs:
        include tripleo::profile::base::nova::vncproxy
      upgrade_tasks:
        - name: Stop nova_vnc_proxy service
-          tags: step2
+          tags: step1
          service: name=openstack-nova-consoleauth state=stopped
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@ -136,7 +136,7 @@ outputs:
          tags: step0,validation
          pacemaker_cluster: state=online check_and_fail=true
        - name: Stop pacemaker cluster
-          tags: step1
+          tags: step2
          pacemaker_cluster: state=offline
        - name: Start pacemaker cluster
          tags: step4
--- a/puppet/services/sahara-api.yaml
+++ b/puppet/services/sahara-api.yaml
@ -92,5 +92,5 @@ outputs:
            - "%{hiera('mysql_bind_host')}"
      upgrade_tasks:
        - name: Stop sahara_api service
-          tags: step2
+          tags: step1
          service: name=openstack-sahara-api state=stopped
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@ -51,5 +51,5 @@ outputs:
        include ::tripleo::profile::base::sahara::engine
      upgrade_tasks:
        - name: Stop sahara_engine service
-          tags: step2
+          tags: step1
          service: name=openstack-sahara-engine state=stopped
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@ -45,5 +45,5 @@ outputs:
        include ::tripleo::profile::base::snmp
      upgrade_tasks:
        - name: Stop snmp service
-          tags: step2
+          tags: step1
          service: name=snmpd state=stopped
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@ -167,5 +167,5 @@ outputs:
            - ResellerAdmin
      upgrade_tasks:
        - name: Stop swift_proxy service
-          tags: step2
+          tags: step1
          service: name=openstack-swift-proxy state=stopped
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@ -103,7 +103,7 @@ outputs:
        include ::tripleo::profile::base::swift::storage
      upgrade_tasks:
        - name: Stop swift storage services
-          tags: step2
+          tags: step1
          service: name={{ item }} state=stopped
          with_items:
            - openstack-swift-account-auditor
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@ -93,5 +93,5 @@ outputs:
          shell: /usr/bin/systemctl show 'openstack-tacker-server' --property ActiveState | grep '\bactive\b'
          tags: step0,validation
        - name: Stop tacker service
-          tags: step2
+          tags: step1
          service: name=openstack-tacker-server state=stopped