diff options
| author | Brian Haley <bhaley@redhat.com> | 2018-02-15 11:58:29 -0500 |
|---|---|---|
| committer | Brian Haley <bhaley@redhat.com> | 2018-04-20 13:26:59 -0400 |
| commit | 58fdba3610a0084cf139484cd23da378e38a9deb (patch) | |
| tree | af52e7c7cca5e867280bda957ee65778e2fa0e7e /docker | |
| parent | 9735112313bd23d74274c70f08207a192db994fc (diff) | |
| download | kolla-58fdba3610a0084cf139484cd23da378e38a9deb.tar.gz kolla-58fdba3610a0084cf139484cd23da378e38a9deb.zip | |
Create radvd container
Also added radvd to neutron-base container since it's
needed for IPv6.
Change-Id: I27e2316b419f48dfb90b536a0835f00b39b28444
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/radvd/Dockerfile.j2 | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 774562822..bfeadddb8 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 %} |