From 2725ed9d842622078e31165d91718e58d07620e0 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Sat, 5 Sep 2020 17:49:35 +0200 Subject: Emergency fixes to pass CI 1) makes bifrost unbuildable as it evolves rapidly at the moment 2) makes neutron bootstrap/upgrade only the core service [1] 1) will be reverted 2) will be made more flexible [1] https://bugs.launchpad.net/bgpvpn/+bug/1894056 Change-Id: I1eefcfceded985b5f61ee8d796f9d8994c9ee97c --- docker/neutron/neutron-server/extend_start.sh | 31 ++++++++++++--------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 3e15043eb..f8017fd08 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -3,18 +3,13 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - OPTS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" - neutron-db-manage ${OPTS} --subproject neutron upgrade head - neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head - neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head - exit 0 -fi - -# Bootstrap and exit if KOLLA_BOOTSTRAP and NEUTRON_SFC_ENABLED variables are set. -# This catches all cases of the KOLLA_BOOTSTRAP and NEUTRON_SFC_ENABLED variable -# being set, including empty. -if [[ "${!NEUTRON_SFC_BOOTSTRAP[@]}" ]]; then - neutron-db-manage --subproject networking-sfc --config-file /etc/neutron/neutron.conf upgrade head + # if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then + # for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do + # neutron-db-manage --subproject $service upgrade head + # done + # fi + # FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done) + neutron-db-manage --subproject neutron upgrade head exit 0 fi @@ -30,10 +25,12 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then echo "Contracting database" fi - if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then - for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do - neutron-db-manage --subproject $service upgrade $DB_ACTION - done - fi + # if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then + # for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do + # neutron-db-manage --subproject $service upgrade $DB_ACTION + # done + # fi + # FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done) + neutron-db-manage --subproject neutron upgrade $DB_ACTION exit 0 fi -- cgit v1.2.3