diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-10-14 03:12:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-14 03:12:34 +0000 |
| commit | 2922a5a43fff66d6cfe45d2fc725fb4f46ee0e17 (patch) | |
| tree | 5e50b70dd49e3824b66a6fc9458b6ed26c274aa9 | |
| parent | d67146637ee4f0d37d5ccba88f8d2207cbd5e1a2 (diff) | |
| parent | e945011ce87cf3a5887c8c87f82b1f419378c06c (diff) | |
| download | kolla-2922a5a43fff66d6cfe45d2fc725fb4f46ee0e17.tar.gz kolla-2922a5a43fff66d6cfe45d2fc725fb4f46ee0e17.zip | |
Merge "Upgrade neutron-fwaas db during bootstrap"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 74e2db1df..d4c55ccbe 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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' ] %} diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index a027bb786..bbef11862 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -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 |