openstack/kolla
Code Issues Proposed changes

Emergency fixes to pass CI

Browse Source 
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
This commit is contained in:
Radosław Piliszek 2020-09-05 17:49:35 +02:00
parent f32eddd6b8
commit 2725ed9d84
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docker/neutron/neutron-server/extend_start.sh
View File

@ -3,18 +3,13 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
OPTS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" # if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then
neutron-db-manage ${OPTS} --subproject neutron upgrade head # for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do
neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head # neutron-db-manage --subproject $service upgrade head
neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head # done
exit 0 # fi
fi # FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done)
neutron-db-manage --subproject neutron upgrade head
# 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
exit 0 exit 0
fi fi
@ -30,10 +25,12 @@ if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
echo "Contracting database" echo "Contracting database"
fi fi
if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then # if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then
for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do # for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do
neutron-db-manage --subproject $service upgrade $DB_ACTION # neutron-db-manage --subproject $service upgrade $DB_ACTION
done # done
fi # fi
# FIXME(yoctozepto): dirty hack to pass CI (uncomment the above when done)
neutron-db-manage --subproject neutron upgrade $DB_ACTION
exit 0 exit 0
fi fi

5
kolla/image/build.py
View File

@ -94,6 +94,7 @@ UNBUILDABLE_IMAGES = {
"telegraf", # no binary package "telegraf", # no binary package
"xtrabackup", # no binary package "xtrabackup", # no binary package
}, },
'binary': { 'binary': {
"bifrost-base", "bifrost-base",
"blazar-base", "blazar-base",
@ -112,6 +113,10 @@ UNBUILDABLE_IMAGES = {
"zun-base", "zun-base",
}, },
'source': {
"bifrost-base", # FIXME(yoctozepto): currently unbuildable
},
'source+aarch64': { 'source+aarch64': {
"monasca-base", # pypi 'confluent-kafka' requires newer libfdkafka-dev "monasca-base", # pypi 'confluent-kafka' requires newer libfdkafka-dev
# than distributions have # than distributions have