openstack/kolla
Code Issues Proposed changes

Merge "Add sfc plugin into neutron-base image"

Browse Source
This commit is contained in:
Jenkins 2017-07-21 10:21:18 +00:00 committed by Gerrit Code Review
commit 8cfdd01ec2
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-neutron-lbaas',
'openstack-neutron-ml2',
'openvswitch',
'python-networking-sfc',
'python-openvswitch',
'python2-oslo-vmware'
] %}
@ -35,6 +36,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
'python-networking-sfc',
'python-openvswitch',
'python-oslo.vmware'
] %}
@ -50,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
'python-networking-sfc',
'python-openvswitch',
'python-oslo.vmware'
] %}

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

@ -7,6 +7,14 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
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
exit 0
fi
# Migrate database and exit if KOLLA_UPGRADE variable is set. This catches all cases
# of the KOLLA_UPGRADE variable being set, including empty.
if [[ "${!KOLLA_UPGRADE[@]}" ]]; then

21
docker/neutron/neutron-sfc-agent/Dockerfile.j2
View File

@ -6,27 +6,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set networking_sfc_agent = ['python-networking-sfc'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set networking_sfc_agent = ['python-networking-sfc'] %}
{% endif %}
{{ macros.install_packages(networking_sfc_agent | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD neutron-sfc-agent-archive /neutron-sfc-agent-source
{% set neutron_sfc_agent_pip_packages = [
'/neutron-sfc-agent'
] %}
RUN ln -s neutron-sfc-agent-source/* neutron-sfc-agent \
&& {{ macros.install_pip(neutron_sfc_agent_pip_packages | customizable("pip_packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start

8
kolla/common/config.py
View File

@ -500,6 +500,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/networking-generic-switch/'
'networking-generic-switch-master.tar.gz')},
'neutron-base-plugin-networking-sfc': {
'type': 'url',
'location': ('$tarballs_base/networking-sfc/'
'networking-sfc-master.tar.gz')},
'neutron-base-plugin-vmware-nsx': {
'type': 'url',
'location': ('$tarballs_base/vmware-nsx/'
@ -544,10 +548,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/neutron-vpnaas/'
'neutron-vpnaas-master.tar.gz')},
'neutron-sfc-agent': {
'type': 'url',
'location': ('$tarballs_base/networking-sfc/'
'networking-sfc-master.tar.gz')},
'neutron-vpnaas-agent': {
'type': 'url',
'location': ('$tarballs_base/neutron-vpnaas/'