diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-17 08:41:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-17 08:41:56 +0000 |
| commit | 90e14b8e7b720a40acc1a90ac92f4680f9ab327d (patch) | |
| tree | 288704f15bfdab7b960ae3daacbc8ff28cdbcb78 | |
| parent | b1796384f77d934b266250997aea42d6dccd2872 (diff) | |
| parent | 9342ed6b6f2bc235e095a5031441073737383946 (diff) | |
| download | kolla-90e14b8e7b720a40acc1a90ac92f4680f9ab327d.tar.gz kolla-90e14b8e7b720a40acc1a90ac92f4680f9ab327d.zip | |
Merge "Add networking-sfc package to tacker images"
| -rw-r--r-- | docker/tacker/tacker-base/Dockerfile.j2 | 13 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/tacker-networking-sfc-138b9fedd09b8728.yaml | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index d3a9f4701..4bc277170 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -11,7 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set tacker_base_packages = [ - 'openstack-tacker-common' + 'openstack-tacker-common', + 'python-networking-sfc' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} @@ -26,16 +27,24 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} ADD tacker-base-archive /tacker-base-source +ADD plugins-archive / {% set tacker_base_pip_packages = [ '/tacker' ] %} +{% set tacker_base_plugins_pip_packages = [ + '/plugins/*' +] %} + RUN ln -s tacker-base-source/* tacker \ && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/tacker \ && cp -r /tacker/etc/tacker/* /etc/tacker \ - && chown -R tacker: /etc/tacker + && chown -R tacker: /etc/tacker \ + && if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ + fi {% endif %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 0acc587d5..081f6063e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -641,6 +641,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/tacker/' 'tacker-master.tar.gz')}, + 'tacker-base-plugin-networking-sfc': { + 'type': 'url', + 'location': ('$tarballs_base/networking-sfc/' + 'networking-sfc-master.tar.gz')}, 'tempest': { 'type': 'url', 'location': ('$tarballs_base/tempest/' diff --git a/releasenotes/notes/tacker-networking-sfc-138b9fedd09b8728.yaml b/releasenotes/notes/tacker-networking-sfc-138b9fedd09b8728.yaml new file mode 100644 index 000000000..16968b389 --- /dev/null +++ b/releasenotes/notes/tacker-networking-sfc-138b9fedd09b8728.yaml @@ -0,0 +1,4 @@ +--- +features: + - Networking-sfc package is installed in tacker images + to provide Service Function Chaining capabilities. |