From 58fdba3610a0084cf139484cd23da378e38a9deb Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Thu, 15 Feb 2018 11:58:29 -0500
Subject: [PATCH] Create radvd container

Also added radvd to neutron-base container since it's
needed for IPv6.

Change-Id: I27e2316b419f48dfb90b536a0835f00b39b28444
---
 docker/neutron/neutron-base/Dockerfile.j2            |  5 +++++
 docker/radvd/Dockerfile.j2                           | 12 ++++++++++++
 .../notes/add-radvd-dockerfile-64668525dae7ead8.yaml |  3 +++
 3 files changed, 20 insertions(+)
 create mode 100644 docker/radvd/Dockerfile.j2
 create mode 100644 releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 774562822d..bfeadddb8d 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 0000000000..2c0bb96e40
--- /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 0000000000..0ea74165ce
--- /dev/null
+++ b/releasenotes/notes/add-radvd-dockerfile-64668525dae7ead8.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add radvd docker container