Remove puppet run and workarounds from tripleo_upgrade_node.sh
For bug 1708115 and the O..P upgrade, and for the upgrade of 'non-controlers' we are now generating ansible playbooks from collected service upgrade_tasks and these are executed instead of the legacy tripleo_upgrade_node.sh. To clarify, by 'non-controllers' it is meant any node for which the corresponding roles_data.yaml role has the disable_upgrade_deployment flag set True. As a first pass, I am removing the workarounds from the script but keeping its delivery mechanism for now in case it is needed still. We can either update here to remove it or keep it until next cycle The most important part for now is that we no longer 'manually' run puppet here. Instead the post_deploy_steps are also collected into a playbook and will be executed after the upgrade_tasks (see the bug for discussion of the mechanism and related reviews) Change-Id: Ib017b0ab435ca9558cf8659d434489cdf01df955 Related-Bug: 1708115
This commit is contained in:
parent
53db241cfb
commit
4c5b9c5c96
@ -54,7 +54,6 @@ resources:
|
||||
params:
|
||||
ROLE_NAME: {{role.name}}
|
||||
- get_file: ../extraconfig/tasks/pacemaker_common_functions.sh
|
||||
- get_file: ../extraconfig/tasks/run_puppet.sh
|
||||
- get_file: ../extraconfig/tasks/tripleo_upgrade_node.sh
|
||||
|
||||
{{role.name}}DeliverUpgradeScriptDeployment:
|
||||
@ -129,32 +128,6 @@ resources:
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
|
||||
# Dump the puppet manifests to be apply later when disable_upgrade_deployment
|
||||
# is to true
|
||||
{% for role in roles if role.disable_upgrade_deployment|default(false) %}
|
||||
{{role.name}}DeliverPuppetConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
config:
|
||||
list_join:
|
||||
- ''
|
||||
- - str_replace:
|
||||
template: |
|
||||
#!/bin/bash
|
||||
cat > /root/{{role.name}}_puppet_config.pp << ENDOFCAT
|
||||
PUPPET_CLASSES
|
||||
ENDOFCAT
|
||||
params:
|
||||
PUPPET_CLASSES: {get_param: [role_data, {{role.name}}, step_config]}
|
||||
|
||||
{{role.name}}DeliverPuppetDeployment:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
properties:
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
config: {get_resource: {{role.name}}DeliverPuppetConfig}
|
||||
{% endfor %}
|
||||
|
||||
# Upgrade Steps for all roles
|
||||
{%- for step in range(0, upgrade_steps_max) %}
|
||||
# Config resources for step {{step}}
|
||||
|
@ -41,6 +41,10 @@ parameters:
|
||||
description: Port that dockerized nova migration target sshd service
|
||||
binds to.
|
||||
type: number
|
||||
UpgradeLevelNovaCompute:
|
||||
type: string
|
||||
description: Nova Compute upgrade level
|
||||
default: ''
|
||||
|
||||
resources:
|
||||
|
||||
@ -142,6 +146,13 @@ outputs:
|
||||
path: /etc/ceph
|
||||
state: directory
|
||||
upgrade_tasks:
|
||||
- name: Set compute upgrade level to auto
|
||||
tags: step1
|
||||
ini_file:
|
||||
str_replace:
|
||||
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
|
||||
params:
|
||||
LEVEL: {get_param: UpgradeLevelNovaCompute}
|
||||
- name: Stop and disable nova-compute service
|
||||
tags: step2
|
||||
service: name=openstack-nova-compute state=stopped enabled=no
|
||||
|
@ -36,7 +36,10 @@ parameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
|
||||
UpgradeLevelNovaCompute:
|
||||
type: string
|
||||
description: Nova Compute upgrade level
|
||||
default: ''
|
||||
|
||||
resources:
|
||||
|
||||
@ -108,6 +111,13 @@ outputs:
|
||||
path: /var/log/containers/nova
|
||||
state: directory
|
||||
upgrade_tasks:
|
||||
- name: Set compute upgrade level to auto
|
||||
tags: step1
|
||||
ini_file:
|
||||
str_replace:
|
||||
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
|
||||
params:
|
||||
LEVEL: {get_param: UpgradeLevelNovaCompute}
|
||||
- name: Stop and disable nova_conductor service
|
||||
tags: step2
|
||||
service: name=openstack-nova-conductor state=stopped enabled=no
|
||||
|
@ -26,52 +26,8 @@ fi
|
||||
DEBUG="true"
|
||||
SCRIPT_NAME=$(basename $0)
|
||||
$(declare -f log_debug)
|
||||
$(declare -f manage_systemd_service)
|
||||
$(declare -f systemctl_swift)
|
||||
$(declare -f special_case_ovs_upgrade_if_needed)
|
||||
|
||||
# pin nova messaging +-1 for the nova-compute service
|
||||
if [[ -n \$NOVA_COMPUTE ]]; then
|
||||
crudini --set /etc/nova/nova.conf upgrade_levels compute auto
|
||||
fi
|
||||
|
||||
special_case_ovs_upgrade_if_needed
|
||||
|
||||
if [[ -n \$SWIFT_STORAGE ]]; then
|
||||
systemctl_swift stop
|
||||
fi
|
||||
|
||||
yum -y update
|
||||
|
||||
if [[ -n \$SWIFT_STORAGE ]]; then
|
||||
systemctl_swift start
|
||||
fi
|
||||
# Due to bug#1640177 we need to restart compute agent
|
||||
if [[ -n \$NOVA_COMPUTE ]]; then
|
||||
log_debug "Restarting openstack ceilometer agent compute"
|
||||
systemctl restart openstack-ceilometer-compute
|
||||
yum install -y openstack-nova-migration
|
||||
# https://bugs.launchpad.net/tripleo/+bug/1707926 stop&disable libvirtd
|
||||
log_debug "Stop and disable libvirtd service for upgrade to containers"
|
||||
systemctl stop libvirtd
|
||||
systemctl disable libvirtd
|
||||
log_debug "Stop and disable openstack-nova-compute for upgrade to containers"
|
||||
systemctl stop openstack-nova-compute
|
||||
systemctl disable openstack-nova-compute
|
||||
fi
|
||||
|
||||
# Apply puppet manifest to converge just right after the ${ROLE} upgrade
|
||||
$(declare -f run_puppet)
|
||||
for step in 1 2 3 4 5 6; do
|
||||
log_debug "Running puppet step \$step for ${ROLE}"
|
||||
if ! run_puppet /root/${ROLE}_puppet_config.pp ${ROLE} \${step}; then
|
||||
log_debug "Puppet failure at step \${step}"
|
||||
exit 1
|
||||
fi
|
||||
log_debug "Completed puppet step \$step"
|
||||
done
|
||||
|
||||
log_debug "TripleO upgrade run completed."
|
||||
log_debug "$UPGRADE_SCRIPT has completed - moving onto ansible playbooks"
|
||||
|
||||
ENDOFCAT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user