diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-21 10:21:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-21 10:21:18 +0000 |
| commit | 8cfdd01ec26e65df1fc00a54af1ec08d47682651 (patch) | |
| tree | ec874409626654a653e6074af3fb3c89eba8d0df /docker/neutron | |
| parent | a26fcb2b3b5334916655155302ed79b02c190360 (diff) | |
| parent | fb003d66ceb46f35675f7e209b18272717841e4c (diff) | |
| download | kolla-8cfdd01ec26e65df1fc00a54af1ec08d47682651.tar.gz kolla-8cfdd01ec26e65df1fc00a54af1ec08d47682651.zip | |
Merge "Add sfc plugin into neutron-base image"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 21 |
3 files changed, 11 insertions, 21 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index e5b64d3a1..74e2db1df 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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' ] %} diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 1d3a31479..a027bb786 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -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 diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index 49956146a..4210483c8 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -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 |