From c5ce1aa2f48a31d7410c51d1d1faa46f8c98b192 Mon Sep 17 00:00:00 2001
From: Matthew Montgomery <matthew@signed8bit.com>
Date: Mon, 25 Jul 2016 15:57:39 -0500
Subject: [PATCH] Customizations for keepalived

This patchset contains Dockerfile customizations for
the keepalived container

Change-Id: I522d2908d3a30178be0c2f22e661b421c5321ffe
Partially-implements: blueprint third-party-plugin-support
---
 docker/keepalived/Dockerfile.j2 | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2
index 0f938440dc..a776e4f6d8 100644
--- a/docker/keepalived/Dockerfile.j2
+++ b/docker/keepalived/Dockerfile.j2
@@ -1,26 +1,26 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        hostname \
-        keepalived \
-        socat \
-    && yum clean all
-
+    {% set keepalived_packages = [
+        'hostname',
+        'keepalived',
+        'socat'
+    ] %}
 {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        keepalived \
-        socat \
-    && apt-get clean
-
+    {% set keepalived_packages = [
+        'keepalived',
+        'socat'
+    ] %}
 {% endif %}
+RUN {{ macros.install_packages(keepalived_packages | customizable("packages")) }}
 
 COPY check_alive.sh /
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
 
+{% block keepalived_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}