From 77aa6763f65926fbf50154bf5d9e042cf67e4973 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 3 May 2018 22:24:16 -0700 Subject: [PATCH] Undercloud upgrades will use upgrade_tasks Instead of using host_prep_tasks (which are part of deployment tasks), we'll use the upgrade tasks that are now well known and tested in previous releases, when the we containerized the overcloud. Depends-On: Id25e6280b4b4f060d5e3f78a50ff83aaca9e6b1a Change-Id: Ic199c7d431e155e2d37996acd0d7b924d14af2b7 --- docker/services/aodh-evaluator.yaml | 10 ----- docker/services/aodh-listener.yaml | 10 ----- docker/services/aodh-notifier.yaml | 10 ----- docker/services/ceilometer-agent-central.yaml | 10 ----- docker/services/ceilometer-agent-compute.yaml | 10 ----- .../ceilometer-agent-notification.yaml | 10 ----- docker/services/cinder-api.yaml | 9 ----- docker/services/cinder-scheduler.yaml | 10 ----- docker/services/cinder-volume.yaml | 10 ----- docker/services/database/mysql.yaml | 38 ++++++++----------- docker/services/glance-api.yaml | 10 ----- docker/services/gnocchi-metricd.yaml | 10 ----- docker/services/gnocchi-statsd.yaml | 10 ----- docker/services/haproxy.yaml | 10 ----- docker/services/heat-api.yaml | 13 +------ docker/services/heat-engine.yaml | 14 +------ docker/services/ironic-conductor.yaml | 10 ----- docker/services/ironic-inspector.yaml | 10 ----- docker/services/keepalived.yaml | 10 ----- docker/services/keystone.yaml | 19 +--------- docker/services/memcached.yaml | 10 ----- .../services/messaging/notify-rabbitmq.yaml | 10 ----- docker/services/messaging/rpc-rabbitmq.yaml | 10 ----- docker/services/mistral-api.yaml | 10 ----- docker/services/mistral-engine.yaml | 10 ----- docker/services/mistral-executor.yaml | 10 ----- docker/services/neutron-api.yaml | 14 +------ docker/services/neutron-dhcp.yaml | 10 ----- docker/services/neutron-l3.yaml | 10 ----- docker/services/neutron-metadata.yaml | 10 ----- docker/services/neutron-ovs-agent.yaml | 12 +----- docker/services/neutron-plugin-ml2.yaml | 12 +----- docker/services/nova-api.yaml | 19 +--------- docker/services/nova-conductor.yaml | 14 +------ docker/services/nova-ironic.yaml | 10 ----- docker/services/nova-scheduler.yaml | 14 +------ docker/services/rabbitmq.yaml | 10 ----- docker/services/swift-proxy.yaml | 17 --------- docker/services/swift-storage.yaml | 15 -------- docker/services/undercloud-upgrade.yaml | 14 +++---- docker/services/zaqar.yaml | 10 ----- .../lifecycle/undercloud-upgrade-prepare.yaml | 4 +- .../undercloud_upgrade-b69ed7d5d002d6ae.yaml | 8 ---- 43 files changed, 34 insertions(+), 472 deletions(-) delete mode 100644 releasenotes/notes/undercloud_upgrade-b69ed7d5d002d6ae.yaml diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index ed10d94997..fa1c18a1fb 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -126,12 +122,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - - name: Stop and disable the aodh-evaluator service - service: - name: openstack-aodh-evaluator - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if aodh_evaluator is deployed command: systemctl is-enabled --quiet openstack-aodh-evaluator diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index 8fd2181c0b..b0c8472260 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -126,12 +122,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - - name: Stop and disable the aodh-listener service - service: - name: openstack-aodh-listener - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if aodh_listener is deployed command: systemctl is-enabled --quiet openstack-aodh-listener diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index f4a130fa54..ebab2f07cf 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -126,12 +122,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - - name: Stop and disable the aodh-notifier service - service: - name: openstack-aodh-notifier - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if aodh_notifier is deployed command: systemctl is-enabled --quiet openstack-aodh-notifier diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index c64dc52506..916fee45ab 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -142,12 +138,6 @@ outputs: Log files from ceilometer containers can be found under /var/log/containers/ceilometer. ignore_errors: true - - name: Stop and disable the ceilometer-central service - service: - name: openstack-ceilometer-central - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if ceilometer_agent_central is deployed command: systemctl is-enabled --quiet openstack-ceilometer-central diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index e4aa54ad89..8e15c7893b 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -113,12 +109,6 @@ outputs: Log files from ceilometer containers can be found under /var/log/containers/ceilometer. ignore_errors: true - - name: Stop and disable the ceilometer-compute service - service: - name: openstack-ceilometer-compute - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if openstack-ceilometer-compute is deployed command: systemctl is-enabled --quiet openstack-ceilometer-compute diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 5a0fa4666b..25fde8262b 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -131,12 +127,6 @@ outputs: Log files from ceilometer containers can be found under /var/log/containers/ceilometer. ignore_errors: true - - name: Stop and disable the ceilometer-notification service - service: - name: openstack-ceilometer-notification - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if ceilometer_agent_notification is deployed command: systemctl is-enabled --quiet openstack-ceilometer-notification diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 6606265dfa..2044e09483 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -43,10 +43,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -206,11 +202,6 @@ outputs: Log files from cinder containers can be found under /var/log/containers/cinder and /var/log/containers/httpd/cinder-api. ignore_errors: true - - name: remove cinder cron jobs - file: - path: /var/spool/cron/cinder - state: absent - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check is cinder_api is deployed command: systemctl is-enabled openstack-cinder-api diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index 86e69c60c6..e946c91f10 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -134,12 +130,6 @@ outputs: Log files from cinder containers can be found under /var/log/containers/cinder and /var/log/containers/httpd/cinder-api. ignore_errors: true - - name: Stop and disable the cinder-scheduler service - service: - name: openstack-cinder-scheduler - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if cinder_scheduler is deployed command: systemctl is-enabled openstack-cinder-scheduler diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index bcab063e0d..de44ade5da 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -65,10 +65,6 @@ parameters: description: > The Ceph cluster name must be at least 1 character and contain only letters and numbers. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -179,12 +175,6 @@ outputs: Log files from cinder containers can be found under /var/log/containers/cinder and /var/log/containers/httpd/cinder-api. ignore_errors: true - - name: Stop and disable the cinder-volume service - service: - name: openstack-cinder-volume - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} - name: ensure ceph configurations exist file: path: /etc/ceph diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index fbe6fcf42b..028a75ac05 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -237,29 +237,6 @@ outputs: Log files from mysql containers can be found under /var/log/containers/mysql. ignore_errors: true - # https://bugs.launchpad.net/tripleo/+bug/1753247 - - name: Rename old neutron database to ovs_neutron - shell: > - if [ -d /var/lib/mysql/neutron ] ; then - mysql -e "CREATE DATABASE IF NOT EXISTS \`ovs_neutron\`;" - for table in `mysql -B -N -e "SHOW TABLES;" neutron` - do - mysql -e "RENAME TABLE \`neutron\`.\`$table\` to \`ovs_neutron\`.\`$table\`" - done - mysql -e "DROP DATABASE \`neutron\`;" - fi - become: true - when: {get_param: UndercloudUpgrade} - - name: Check if mysql service is deployed - command: systemctl is-enabled --quiet mariadb - ignore_errors: True - register: mariadb_enabled - when: {get_param: UndercloudUpgrade} - - name: Stop and disable mysql service when undercloud is containerized - when: - - {get_param: UndercloudUpgrade} - - mariadb_enabled.rc == 0 - service: name=mariadb state=stopped enabled=no upgrade_tasks: - name: Check if mysql service is deployed command: systemctl is-enabled --quiet mariadb @@ -272,6 +249,21 @@ outputs: - step|int == 0 - mariadb_enabled.rc == 0 tags: validation + # https://bugs.launchpad.net/tripleo/+bug/1753247 + - name: Rename old neutron database to ovs_neutron + shell: > + if [ -d /var/lib/mysql/neutron ] ; then + mysql -e "CREATE DATABASE IF NOT EXISTS \`ovs_neutron\`;" + for table in `mysql -B -N -e "SHOW TABLES;" neutron` + do + mysql -e "RENAME TABLE \`neutron\`.\`$table\` to \`ovs_neutron\`.\`$table\`" + done + mysql -e "DROP DATABASE \`neutron\`;" + fi + become: true + when: + - step|int == 1 + - {get_param: UndercloudUpgrade} - name: Stop and disable mysql service when: - step|int == 2 diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index cb801ecb98..3eec205390 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -87,10 +87,6 @@ parameters: description: > The Ceph cluster name must be at least 1 character and contain only letters and numbers. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -263,12 +259,6 @@ outputs: file: path: /etc/ceph state: directory - - name: Stop and disable the glance-api service - service: - name: openstack-glance-api - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if glance_api is deployed command: systemctl is-enabled --quiet openstack-glance-api diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index 606d1fa0fb..e8d4ae2093 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/docker/services/gnocchi-metricd.yaml @@ -48,10 +48,6 @@ parameters: description: > The Ceph cluster name must be at least 1 character and contain only letters and numbers. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -149,12 +145,6 @@ outputs: file: path: /etc/ceph state: directory - - name: Stop and disable the gnocchi-metricd service - service: - name: gnocchi-metricd - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if gnocchi_metricd is deployed command: systemctl is-enabled --quiet openstack-gnocchi-metricd diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index d977573949..2b0bc61042 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/docker/services/gnocchi-statsd.yaml @@ -48,10 +48,6 @@ parameters: description: > The Ceph cluster name must be at least 1 character and contain only letters and numbers. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -149,12 +145,6 @@ outputs: file: path: /etc/ceph state: directory - - name: Stop and disable the gnocchi-statsd service - service: - name: gnocchi-statsd - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if gnocchi_statsd is deployed command: systemctl is-enabled --quiet openstack-gnocchi-statsd diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index 4598416d46..62d7a3b5b1 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -82,10 +82,6 @@ parameters: default: false description: Whether to run config management (e.g. Puppet) in debug mode. type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: puppet_debug_enabled: {get_param: ConfigDebug} @@ -267,11 +263,5 @@ outputs: Log files from the haproxy containers can be found under /var/log/containers/haproxy. ignore_errors: true - - name: Stop and disable the haproxy service - service: - name: haproxy - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} metadata_settings: get_attr: [HAProxyBase, role_data, metadata_settings] diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 065669589c..679bb8e140 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -48,10 +48,6 @@ parameters: default: [] description: list of optional environment variables type: comma_delimited_list - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -170,14 +166,7 @@ outputs: - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - list_concat: - - {get_attr: [HeatApiLogging, host_prep_tasks]} - - - name: remove heat cron jobs - file: - path: /var/spool/cron/heat - state: absent - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [HeatApiLogging, host_prep_tasks]} upgrade_tasks: - name: Check if heat_api is deployed command: systemctl is-enabled --quiet openstack-heat-api diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index daeb450532..3c8c7335d2 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -136,15 +132,7 @@ outputs: - /var/lib/config-data/puppet-generated/heat/:/var/lib/kolla/config_files/src:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - list_concat: - - {get_attr: [HeatEngineLogging, host_prep_tasks]} - - - name: Stop and disable the heat-engine service - service: - name: openstack-heat-engine - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [HeatEngineLogging, host_prep_tasks]} upgrade_tasks: - name: Check if heat_engine is deployed command: systemctl is-enabled --quiet openstack-heat-engine diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 0979bd14ef..6cb5ec8548 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -41,10 +41,6 @@ parameters: description: Whether to configure Swift temporary URLs for use with the "direct" and "ansible" deploy interfaces. type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: configure_swift_temp_url: {equals: [{get_param: IronicConfigureSwiftTempUrlKey}, true]} @@ -188,12 +184,6 @@ outputs: Log files from ironic containers can be found under /var/log/containers/ironic and /var/log/containers/httpd/ironic-*. ignore_errors: true - - name: Stop and disable the ironic-conductor service - service: - name: openstack-ironic-conductor - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} - name: stat /httpboot stat: path=/httpboot register: stat_httpboot diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml index dcc72bb33b..3d64f9383d 100644 --- a/docker/services/ironic-inspector.yaml +++ b/docker/services/ironic-inspector.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false IPAImageURLs: default: [] description: IPA image URLs, the format should be ["http://path/to/kernel", "http://path/to/ramdisk"] @@ -209,12 +205,6 @@ outputs: Log files from ironic-inspector container can be found under /var/log/containers/ironic-inspector. ignore_errors: true - - name: Stop and disable the ironic-inspector service - service: - name: openstack-ironic-inspector - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - when: step|int == 2 block: diff --git a/docker/services/keepalived.yaml b/docker/services/keepalived.yaml index 5ab858d3c7..5654b0b81f 100644 --- a/docker/services/keepalived.yaml +++ b/docker/services/keepalived.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -117,12 +113,6 @@ outputs: Log files from keepalived containers can be found under /var/log/containers/keepalived. ignore_errors: true - - name: Stop and disable the keepalived service - service: - name: keepalived - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if keepalived is deployed command: systemctl is-enabled --quiet keepalived diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index bf2ab5d27e..6078d96b7c 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -49,10 +49,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -211,20 +207,7 @@ outputs: puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain' step_config: 'include ::tripleo::profile::base::keystone' config_image: *keystone_config_image - host_prep_tasks: - list_concat: - - {get_attr: [KeystoneLogging, host_prep_tasks]} - - - name: Stop and disable the httpd service - service: - name: httpd - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} - - name: remove keystone cron jobs - file: - path: /var/spool/cron/keystone - state: absent - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]} upgrade_tasks: - name: Check for keystone running under apache tags: common diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml index e5a0a106ac..a73a84d140 100644 --- a/docker/services/memcached.yaml +++ b/docker/services/memcached.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -120,12 +116,6 @@ outputs: Log files from memcached containers can be found under /var/log/containers/memcached. ignore_errors: true - - name: Stop and disable the memcached service - service: - name: memcached - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if memcached is deployed command: systemctl is-enabled --quiet memcached diff --git a/docker/services/messaging/notify-rabbitmq.yaml b/docker/services/messaging/notify-rabbitmq.yaml index 4341db4b45..b4e8c17820 100644 --- a/docker/services/messaging/notify-rabbitmq.yaml +++ b/docker/services/messaging/notify-rabbitmq.yaml @@ -48,10 +48,6 @@ parameters: type: string description: Specifies the default CA cert to use if TLS is used for services in the internal network. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -229,12 +225,6 @@ outputs: Log files from rabbitmq containers can be found under /var/log/containers/rabbitmq. ignore_errors: true - - name: Stop and disable the rabbitmq-server service - service: - name: rabbitmq-server - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if rabbitmq server is deployed command: systemctl is-enabled --quiet rabbitmq-server diff --git a/docker/services/messaging/rpc-rabbitmq.yaml b/docker/services/messaging/rpc-rabbitmq.yaml index 5648f6df7c..7fe79eec1f 100644 --- a/docker/services/messaging/rpc-rabbitmq.yaml +++ b/docker/services/messaging/rpc-rabbitmq.yaml @@ -48,10 +48,6 @@ parameters: type: string description: Specifies the default CA cert to use if TLS is used for services in the internal network. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -229,12 +225,6 @@ outputs: Log files from rabbitmq containers can be found under /var/log/containers/rabbitmq. ignore_errors: true - - name: Stop and disable the rabbitmq-server service - service: - name: rabbitmq-server - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if rabbitmq server is deployed command: systemctl is-enabled --quiet rabbitmq-server diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index 9097e6a786..abf6cf148b 100644 --- a/docker/services/mistral-api.yaml +++ b/docker/services/mistral-api.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -164,12 +160,6 @@ outputs: Log files from mistral containers can be found under /var/log/containers/mistral. ignore_errors: true - - name: Stop and disable the mistral-api service - service: - name: openstack-mistral-api - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if mistral api is deployed command: systemctl is-enabled --quiet openstack-mistral-api diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index 3b0c871178..afd7c419ed 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -124,12 +120,6 @@ outputs: Log files from mistral containers can be found under /var/log/containers/mistral. ignore_errors: true - - name: Stop and disable the mistral-engine service - service: - name: openstack-mistral-engine - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if mistral engine is deployed command: systemctl is-enabled --quiet openstack-mistral-engine diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index f2150ed027..1c7c0c70e4 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -132,12 +128,6 @@ outputs: Log files from mistral containers can be found under /var/log/containers/mistral. ignore_errors: true - - name: Stop and disable the mistral-executor service - service: - name: openstack-mistral-executor - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if mistral executor is deployed command: systemctl is-enabled --quiet openstack-mistral-executor diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index fb2f776177..3d67d623ef 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -51,10 +51,6 @@ parameters: default: [] description: list of optional environment variables type: comma_delimited_list - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -191,15 +187,7 @@ outputs: environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - {} - host_prep_tasks: - list_concat: - - {get_attr: [NeutronLogging, host_prep_tasks]} - - - name: Stop and disable the neutron-server service - service: - name: neutron-server - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]} upgrade_tasks: - name: Check if neutron_server is deployed command: systemctl is-enabled --quiet neutron-server diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index b0c79d44bf..02811fc806 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -48,10 +48,6 @@ parameters: type: string description: Specifies the default CA cert to use if TLS is used for services in the internal network. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -173,12 +169,6 @@ outputs: file: path: /var/lib/neutron state: directory - - name: Stop and disable the neutron-dhcp-agent service - service: - name: neutron-dhcp-agent - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if neutron_dhcp_agent is deployed command: systemctl is-enabled --quiet neutron-dhcp-agent diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index dc39799cc7..a3878703cb 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -40,10 +40,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -136,12 +132,6 @@ outputs: file: path: /var/lib/neutron state: directory - - name: Stop and disable the neutron-l3-agent service - service: - name: neutron-l3-agent - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if neutron_l3_agent is deployed command: systemctl is-enabled --quiet neutron-l3-agent diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index bd668e7acf..7968ed5c31 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -129,12 +125,6 @@ outputs: file: path: /var/lib/neutron state: directory - - name: Stop and disable the neutron-metadata-agent service - service: - name: neutron-metadata-agent - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if neutron_metadata_agent is deployed command: systemctl is-enabled --quiet neutron-metadata-agent diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 244384eb0f..b04d9e2a64 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -44,10 +44,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -172,13 +168,7 @@ outputs: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS metadata_settings: get_attr: [NeutronOvsAgentBase, role_data, metadata_settings] - host_prep_tasks: - - name: Stop and disable the neutron-ovs-agent service - service: - name: neutron-openvswitch-agent - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]} upgrade_tasks: list_concat: - get_attr: [NeutronOvsAgentBase, role_data, ovs_upgrade_tasks] diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml index 78b1e6ce56..1978123941 100644 --- a/docker/services/neutron-plugin-ml2.yaml +++ b/docker/services/neutron-plugin-ml2.yaml @@ -32,10 +32,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false NeutronPluginMl2PuppetTags: default: 'neutron_plugin_ml2' description: Puppet resource tag names that are used to generate config files with puppet @@ -75,10 +71,4 @@ outputs: config_image: {get_param: DockerNeutronConfigImage} kolla_config: {} docker_config: {} - host_prep_tasks: - - name: Stop and disable the ironic-neutron-agent service - service: - name: ironic-neutron-agent - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: [] diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index c0f60fbc03..258ae5041c 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -57,10 +57,6 @@ parameters: description: The password for the nova service and db account type: string hidden: true - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -317,20 +313,7 @@ outputs: - {get_param: DeployIdentifier} metadata_settings: get_attr: [NovaApiBase, role_data, metadata_settings] - host_prep_tasks: - list_concat: - - {get_attr: [NovaApiLogging, host_prep_tasks]} - - - name: remove nova cron jobs - file: - path: /var/spool/cron/nova - state: absent - when: {get_param: UndercloudUpgrade} - - name: Stop and disable the nova-api service - service: - name: openstack-nova-api - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [NovaApiLogging, host_prep_tasks]} upgrade_tasks: - name: Check if nova_api is deployed command: systemctl is-enabled --quiet openstack-nova-api diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 45bf50331c..61ad10c694 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -44,10 +44,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -130,15 +126,7 @@ outputs: - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - list_concat: - - {get_attr: [NovaLogging, host_prep_tasks]} - - - name: Stop and disable the nova-conductor service - service: - name: openstack-nova-conductor - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [NovaLogging, host_prep_tasks]} upgrade_tasks: - name: Check if nova_conductor is deployed command: systemctl is-enabled --quiet openstack-nova-conductor diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 7f942a6723..853145fa61 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -36,10 +36,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -134,12 +130,6 @@ outputs: Log files from nova containers can be found under /var/log/containers/nova and /var/log/containers/httpd/nova-*. ignore_errors: true - - name: Stop and disable the nova-compute service - service: - name: openstack-nova-compute - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if nova ironic is deployed command: systemctl is-enabled --quiet openstack-nova-compute diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index a7daadbd7d..2895e58b40 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -40,10 +40,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -126,15 +122,7 @@ outputs: - /run:/run environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - list_concat: - - {get_attr: [NovaLogging, host_prep_tasks]} - - - name: Stop and disable the nova-scheduler service - service: - name: openstack-nova-scheduler - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} + host_prep_tasks: {get_attr: [NovaLogging, host_prep_tasks]} upgrade_tasks: - name: Check if nova_scheduler is deployed command: systemctl is-enabled --quiet openstack-nova-scheduler diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index fd14ba449a..45946e04cb 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -48,10 +48,6 @@ parameters: type: string description: Specifies the default CA cert to use if TLS is used for services in the internal network. - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: @@ -228,12 +224,6 @@ outputs: Log files from rabbitmq containers can be found under /var/log/containers/rabbitmq. ignore_errors: true - - name: Stop and disable the rabbitmq-server service - service: - name: rabbitmq-server - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check if rabbitmq server is deployed command: systemctl is-enabled --quiet rabbitmq-server diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 23da11b071..1655406abc 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -47,10 +47,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false DeployIdentifier: default: '' type: string @@ -257,19 +253,6 @@ outputs: src: /var/log/swift dest: /var/log/containers/swift state: link - - name: Stop and disable the swift proxy services - service: - name: "{{ item }}" - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} - with_items: - - openstack-swift-account - - openstack-swift-account-reaper - - openstack-swift-container - - openstack-swift-container-sync - - openstack-swift-container-updater - - openstack-swift-proxy upgrade_tasks: - name: Check if swift-proxy or swift-object-expirer are deployed command: systemctl is-enabled --quiet "{{ item }}" diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index fdba400976..d118088643 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -57,10 +57,6 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false resources: @@ -485,17 +481,6 @@ outputs: template: 'DEVICE' for_each: DEVICE: {get_param: SwiftRawDisks} - - name: Stop and disable the swift storage services - service: - name: "{{ item }}" - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} - with_items: - - openstack-swift-object - - openstack-swift-object-expirer - - openstack-swift-object-reconstructor - - openstack-swift-object-updater upgrade_tasks: - name: Check if swift storage services are deployed command: systemctl is-enabled --quiet "{{ item }}" diff --git a/docker/services/undercloud-upgrade.yaml b/docker/services/undercloud-upgrade.yaml index 2d80d58d7a..0140b8d5fb 100644 --- a/docker/services/undercloud-upgrade.yaml +++ b/docker/services/undercloud-upgrade.yaml @@ -37,16 +37,16 @@ outputs: value: service_name: undercloud_upgrade config_settings: {} - deploy_steps_tasks: - - name: upgrade all packages - yum: - name: '*' - state: latest - when: step|int == 1 + deploy_steps_tasks: [] docker_config: {} kolla_config: {} puppet_config: config_volume: '' step_config: '' config_image: '' - upgrade_tasks: [] + upgrade_tasks: + - name: upgrade all packages + yum: + name: '*' + state: latest + when: step|int == 1 diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 09c8c8f020..3f9d6b6335 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -43,10 +43,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UndercloudUpgrade: - type: boolean - description: Flag to indicate undercloud upgrade process is being run. - default: false conditions: zaqar_management_store_sqlalchemy: {equals : [{get_param: ZaqarManagementStore}, 'sqlalchemy']} @@ -198,12 +194,6 @@ outputs: Log files from zaqar containers can be found under /var/log/containers/zaqar and /var/log/containers/httpd/zaqar. ignore_errors: true - - name: Stop and disable the zaqar-server service - service: - name: openstack-zaqar@1 - state: stopped - enabled: no - when: {get_param: UndercloudUpgrade} upgrade_tasks: - name: Check for zaqar running under apache tags: common diff --git a/environments/lifecycle/undercloud-upgrade-prepare.yaml b/environments/lifecycle/undercloud-upgrade-prepare.yaml index 9ac12119d6..8af1c39eb8 100644 --- a/environments/lifecycle/undercloud-upgrade-prepare.yaml +++ b/environments/lifecycle/undercloud-upgrade-prepare.yaml @@ -5,4 +5,6 @@ resource_registry: OS::TripleO::Services::UndercloudUpgrade: ../../docker/services/undercloud-upgrade.yaml parameter_defaults: - UndercloudUpgrade: true + # TODO(emilien) add interface in tripleoclient so operator can easily choose to cleanup + # or not the packages after an upgrade. + UpgradeRemoveUnusedPackages: false diff --git a/releasenotes/notes/undercloud_upgrade-b69ed7d5d002d6ae.yaml b/releasenotes/notes/undercloud_upgrade-b69ed7d5d002d6ae.yaml deleted file mode 100644 index 11b61fee23..0000000000 --- a/releasenotes/notes/undercloud_upgrade-b69ed7d5d002d6ae.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -upgrade: - - | - The Undercloud upgrade is now done via host_prep_tasks in the docker services, driven - by tripleoclient when containerizing the Undercloud. - Note that the crontabs that were not managed by Puppet (e.g. custom crontabs) for the - openstack services (cinder, heat, keystone and nova) will be removed and need to be - containerized or re-added manually after the upgrade.