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
This commit is contained in:
parent
68c16cc8a3
commit
77aa6763f6
docker/services
aodh-evaluator.yamlaodh-listener.yamlaodh-notifier.yamlceilometer-agent-central.yamlceilometer-agent-compute.yamlceilometer-agent-notification.yamlcinder-api.yamlcinder-scheduler.yamlcinder-volume.yaml
database
glance-api.yamlgnocchi-metricd.yamlgnocchi-statsd.yamlhaproxy.yamlheat-api.yamlheat-engine.yamlironic-conductor.yamlironic-inspector.yamlkeepalived.yamlkeystone.yamlmemcached.yamlmessaging
mistral-api.yamlmistral-engine.yamlmistral-executor.yamlneutron-api.yamlneutron-dhcp.yamlneutron-l3.yamlneutron-metadata.yamlneutron-ovs-agent.yamlneutron-plugin-ml2.yamlnova-api.yamlnova-conductor.yamlnova-ironic.yamlnova-scheduler.yamlrabbitmq.yamlswift-proxy.yamlswift-storage.yamlundercloud-upgrade.yamlzaqar.yamlenvironments/lifecycle
releasenotes/notes
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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]
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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]
|
||||
|
@ -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: []
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 }}"
|
||||
|
@ -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 }}"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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.
|
Loading…
x
Reference in New Issue
Block a user