Merge "Fix neutron rolling upgrade"

This commit is contained in:
Zuul 2019-03-25 12:53:35 +00:00 committed by Gerrit Code Review
commit 42d664c156

View File

@ -19,7 +19,7 @@
KOLLA_UPGRADE: KOLLA_UPGRADE:
NEUTRON_DB_EXPAND: NEUTRON_DB_EXPAND:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
NEUTRON_ROLLING_UPGRADE_SERVICES: "{{ neutron_rolling_upgrade_services }}" NEUTRON_ROLLING_UPGRADE_SERVICES: "{{ neutron_rolling_upgrade_services | join(' ') }}"
image: "{{ neutron_server.image }}" image: "{{ neutron_server.image }}"
labels: labels:
UPGRADE: UPGRADE:
@ -76,7 +76,7 @@
KOLLA_UPGRADE: KOLLA_UPGRADE:
NEUTRON_DB_CONTRACT: NEUTRON_DB_CONTRACT:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
NEUTRON_ROLLING_UPGRADE_SERVICES: "{{ neutron_rolling_upgrade_services }}" NEUTRON_ROLLING_UPGRADE_SERVICES: "{{ neutron_rolling_upgrade_services | join(' ') }}"
image: "{{ neutron_server.image }}" image: "{{ neutron_server.image }}"
labels: labels:
UPGRADE: UPGRADE: