Merge "Fix the undefined operation_type variable." into stable/rocky

This commit is contained in:
Zuul 2019-12-19 20:45:31 +00:00 committed by Gerrit Code Review
commit 255b218846
2 changed files with 4 additions and 4 deletions

View File

@ -2,9 +2,9 @@
#
# Run online data migration for OpenStack services
#
{% if overcloud_update|bool -%}
{% if overcloud_update|bool or update_noop|bool -%}
{% set operation_type = 'update' -%}
{% elif overcloud_upgrade|bool -%}
{% elif overcloud_upgrade|bool or upgrade_noop|bool -%}
{% set operation_type = 'upgrade' -%}
{% endif -%}
set -euo pipefail

View File

@ -2,9 +2,9 @@
#
# Prepare conatainer images for overcloud update/upgrade
#
{% if overcloud_update|bool -%}
{% if overcloud_update|bool or update_noop|bool -%}
{% set operation_type = 'update' -%}
{% elif overcloud_upgrade|bool -%}
{% elif overcloud_upgrade|bool or upgrade_noop|bool -%}
{% set operation_type = 'upgrade' -%}
{% endif -%}
set -euo pipefail