diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-04 06:19:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-04 06:19:25 +0000 |
| commit | e9a68b5fc0a49769bdbdd89266f2ad749cd598e6 (patch) | |
| tree | 98303daed166adb0a5406c47e5ead3bbdcd17379 | |
| parent | 27381101bce3454e03b692d5330428b0a2268c46 (diff) | |
| parent | 58fdba3610a0084cf139484cd23da378e38a9deb (diff) | |
| download | kolla-e9a68b5fc0a49769bdbdd89266f2ad749cd598e6.tar.gz kolla-e9a68b5fc0a49769bdbdd89266f2ad749cd598e6.zip | |
Merge "Create radvd container"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/radvd/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml | 3 |
3 files changed, 20 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index ab27210f4..9a2c2b3c3 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set neutron_base_packages = [ 'keepalived', 'net-tools', + 'radvd', 'openstack-neutron', 'openstack-neutron-fwaas', 'openstack-neutron-lbaas', @@ -35,6 +36,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'iputils-ping', 'keepalived', 'net-tools', + 'radvd', 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', @@ -51,6 +53,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'iputils-ping', 'keepalived', 'net-tools', + 'radvd', 'neutron-lbaas-common', 'neutron-plugin-ml2', 'neutron-server', @@ -86,6 +89,7 @@ RUN mkdir -p /usr/share/neutron \ 'net-tools', 'openvswitch', 'python-openvswitch', + 'radvd', 'uuid' ] %} @@ -105,6 +109,7 @@ RUN mkdir -p /usr/share/neutron \ 'net-tools', 'openvswitch-switch', 'python-openvswitch', + 'radvd', 'uuid-runtime' ] %} diff --git a/docker/radvd/Dockerfile.j2 b/docker/radvd/Dockerfile.j2 new file mode 100644 index 000000000..2c0bb96e4 --- /dev/null +++ b/docker/radvd/Dockerfile.j2 @@ -0,0 +1,12 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block radvd_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% set radvd_packages = ['radvd'] %} +{{ macros.install_packages(radvd_packages| customizable("packages")) }} + +{% block radvd_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml b/releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml new file mode 100644 index 000000000..0ea74165c --- /dev/null +++ b/releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add radvd docker container |