Merge "Re-use undercloud upgrades tasks." into stable/queens
This commit is contained in:
commit
a8c5a70f26
@ -50,9 +50,7 @@ workload_image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-
|
||||
workload_memory: "512"
|
||||
workload_launch_post_composable_upgrade: false
|
||||
|
||||
# upgrade jinja template name:
|
||||
undercloud_upgrade_template: undercloud_upgrade.sh.j2
|
||||
undercloud_update_template: undercloud_update.sh.j2
|
||||
overcloud_upgrade_prepare_template: overcloud_upgrade_prepare.sh.j2
|
||||
overcloud_upgrade_run_template: overcloud_upgrade_run.sh.j2
|
||||
overcloud_upgrade_converge_template: overcloud_upgrade_converge.sh.j2
|
||||
|
@ -1,7 +1,9 @@
|
||||
---
|
||||
- name: create undercloud update script
|
||||
vars:
|
||||
log_prefix: "update"
|
||||
template:
|
||||
src: "{{ undercloud_update_template }}"
|
||||
src: "{{ undercloud_upgrade_template }}"
|
||||
dest: "{{ undercloud_update_script }}"
|
||||
mode: 0775
|
||||
force: true
|
||||
|
@ -22,7 +22,7 @@
|
||||
when: updates_workarounds|bool
|
||||
|
||||
- name: validate undercloud update
|
||||
include: ../upgrade/undercloud_validate_upgrade.yaml
|
||||
include: ../common/undercloud_validate_upgrade.yaml
|
||||
tags: undercloud_update_validate
|
||||
|
||||
when: undercloud_update|bool
|
||||
|
@ -33,10 +33,13 @@
|
||||
mode: 0775
|
||||
|
||||
- name: create undercloud upgrade script
|
||||
vars:
|
||||
log_prefix: "upgrade"
|
||||
template:
|
||||
src: "{{ undercloud_upgrade_template }}"
|
||||
dest: "{{ undercloud_upgrade_script }}"
|
||||
mode: 0775
|
||||
force: true
|
||||
|
||||
- name: create upgrade workaround scripts
|
||||
template:
|
||||
|
@ -14,7 +14,7 @@
|
||||
tags: undercloud_upgrade
|
||||
|
||||
- name: validate undercloud upgrade
|
||||
include: undercloud_validate_upgrade.yaml
|
||||
include: ../common/undercloud_validate_upgrade.yaml
|
||||
tags: undercloud_upgrade_validate
|
||||
|
||||
- name: apply post undercloud upgrade workarounds
|
||||
|
@ -1,5 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
sudo yum update -y python-tripleoclient
|
||||
|
||||
openstack undercloud upgrade 2>&1
|
@ -3,8 +3,5 @@
|
||||
# Perform undercloud upgrade and related steps
|
||||
set -euo pipefail
|
||||
|
||||
# ceph-ansible needs to be installed manually
|
||||
sudo yum install -y ceph-ansible
|
||||
|
||||
sudo yum update -y python-tripleoclient
|
||||
openstack undercloud upgrade &> undercloud_upgrade.log
|
||||
openstack undercloud upgrade &> undercloud_{{ log_prefix }}.log
|
||||
|
Loading…
Reference in New Issue
Block a user