openstack/kolla
Code Issues Proposed changes

Merge "Upgrade neutron-fwaas db during bootstrap"

Browse Source
This commit is contained in:
Jenkins 2017-10-14 03:12:34 +00:00 committed by Gerrit Code Review
commit 2922a5a43f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -18,6 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'keepalived',
'net-tools',
'openstack-neutron',
'openstack-neutron-fwaas',
'openstack-neutron-lbaas',
'openstack-neutron-ml2',
'openvswitch',
@ -53,6 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-server',
'openvswitch-switch',
'python-networking-sfc',
'python-neutron-fwaas',
'python-openvswitch',
'python-oslo.vmware'
] %}

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

@ -3,7 +3,9 @@
# 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
neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
OTPS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
neutron-db-manage ${OPTS} upgrade head
neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head
exit 0
fi