Browse Source

Put service stop at step1 and quiesce at step2.

In the previous release[1], the services were stopped before the
pacemaker services, so that they get a chance to send last message to
the database/rabbitmq queue:

Let's do the upgrade in the same order.

[1] https://github.com/openstack/tripleo-heat-templates/blob/stable/newton/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh#L13-L71

Change-Id: I1c4045e8b9167396c9dfa4da99973102f1af1218
changes/90/438090/9
Sofer Athlan-Guyot 5 years ago
parent
commit
fb78213782
  1. 19
      puppet/services/README.rst
  2. 2
      puppet/services/aodh-api.yaml
  3. 2
      puppet/services/aodh-evaluator.yaml
  4. 2
      puppet/services/aodh-listener.yaml
  5. 2
      puppet/services/aodh-notifier.yaml
  6. 2
      puppet/services/ceilometer-agent-central.yaml
  7. 2
      puppet/services/ceilometer-agent-compute.yaml
  8. 2
      puppet/services/ceilometer-agent-notification.yaml
  9. 2
      puppet/services/ceilometer-api.yaml
  10. 2
      puppet/services/ceilometer-collector.yaml
  11. 6
      puppet/services/cinder-api.yaml
  12. 2
      puppet/services/cinder-scheduler.yaml
  13. 2
      puppet/services/cinder-volume.yaml
  14. 2
      puppet/services/congress.yaml
  15. 2
      puppet/services/disabled/glance-registry.yaml
  16. 4
      puppet/services/glance-api.yaml
  17. 2
      puppet/services/gnocchi-api.yaml
  18. 2
      puppet/services/gnocchi-metricd.yaml
  19. 2
      puppet/services/gnocchi-statsd.yaml
  20. 2
      puppet/services/haproxy.yaml
  21. 2
      puppet/services/heat-api-cfn.yaml
  22. 2
      puppet/services/heat-api-cloudwatch.yaml
  23. 2
      puppet/services/heat-api.yaml
  24. 2
      puppet/services/heat-engine.yaml
  25. 2
      puppet/services/horizon.yaml
  26. 2
      puppet/services/ironic-api.yaml
  27. 2
      puppet/services/ironic-conductor.yaml
  28. 2
      puppet/services/keystone.yaml
  29. 2
      puppet/services/logging/fluentd-client.yaml
  30. 2
      puppet/services/metrics/collectd.yaml
  31. 2
      puppet/services/monitoring/sensu-client.yaml
  32. 2
      puppet/services/neutron-api.yaml
  33. 2
      puppet/services/neutron-dhcp.yaml
  34. 2
      puppet/services/neutron-l3.yaml
  35. 2
      puppet/services/neutron-metadata.yaml
  36. 2
      puppet/services/neutron-ovs-agent.yaml
  37. 2
      puppet/services/nova-compute.yaml
  38. 4
      puppet/services/nova-conductor.yaml
  39. 2
      puppet/services/nova-consoleauth.yaml
  40. 2
      puppet/services/nova-placement.yaml
  41. 2
      puppet/services/nova-scheduler.yaml
  42. 2
      puppet/services/nova-vnc-proxy.yaml
  43. 2
      puppet/services/pacemaker.yaml
  44. 2
      puppet/services/sahara-api.yaml
  45. 2
      puppet/services/sahara-engine.yaml
  46. 2
      puppet/services/snmp.yaml
  47. 2
      puppet/services/swift-proxy.yaml
  48. 2
      puppet/services/swift-storage.yaml
  49. 2
      puppet/services/tacker.yaml

19
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
2) Stop all control-plane services, ready for upgrade
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
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

6
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

2
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

2
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

2
puppet/services/congress.yaml

@ -93,5 +93,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

2
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

4
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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]

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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"

4
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"

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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
Loading…
Cancel
Save