Merge "Add container image prepare script to upgrade workflow."

This commit is contained in:
Zuul 2018-11-08 01:18:44 +00:00 committed by Gerrit Code Review
commit 57dd504735
5 changed files with 47 additions and 0 deletions

View File

@ -38,6 +38,13 @@
mode: 0775
force: true
- name: create overcloud_prepare_containers.sh script
template:
src: overcloud_prepare_containers.sh.j2
dest: "{{ working_dir }}/overcloud_prepare_containers.sh"
mode: 0755
force: true
- name: create overcloud update script
template:
src: "{{ overcloud_update_run_template }}"

View File

@ -61,6 +61,14 @@
{{ working_dir }}/post_overcloud_update_prepare_workarounds.log
when: updates_workarounds|bool
- name: prepare containers for overcloud update
args:
chdir: "{{working_dir}}"
shell: |
set -o pipefail
bash {{ working_dir }}/overcloud_prepare_containers.sh {{ timestamper_cmd }} > overcloud_update_prepare_containers.log
tags: overcloud_update_prepare_containers
- name: Ensure ansible-pacemaker module is present in CI.
yum: name=ansible-pacemaker state=latest
when: tripleo_ci|default(false)|bool

View File

@ -54,6 +54,12 @@
mode: 0775
when: upgrade_init_command is string
- name: create overcloud_prepare_containers.sh script
template:
src: overcloud_prepare_containers.sh.j2
dest: "{{ working_dir }}/overcloud_prepare_containers.sh"
mode: 0755
force: true
- name: create overcloud upgrade script
template:

View File

@ -64,6 +64,14 @@
when: upgrade_workarounds
tags: overcloud_upgrade_prepare
- name: prepare containers for overcloud upgrade
args:
chdir: "{{working_dir}}"
shell: |
set -o pipefail
bash {{ working_dir }}/overcloud_prepare_containers.sh {{ timestamper_cmd }} > overcloud_upgrade_prepare_containers.log
tags: overcloud_upgrade_prepare_containers
- name: Ensure ansible-pacemaker module is present in CI.
yum: name=ansible-pacemaker state=latest
when: tripleo_ci|default(false)|bool

View File

@ -0,0 +1,18 @@
#!/bin/env bash
#
# Prepare conatainer images for overcloud update/upgrade
#
{% if overcloud_update|bool -%}
{% set operation_type = 'update' -%}
{% elif overcloud_upgrade|bool -%}
{% set operation_type = 'upgrade' -%}
{% endif -%}
set -euo pipefail
source {{undercloud_rc }}
echo "[$(date)] Start preparing container images for overcloud {{ operation_type }}"
openstack overcloud external-{{ operation_type }} run \
--stack {{ overcloud_stack_name }} \
--tags container_image_prepare 2>&1