Merge "Customizations for Nova"

1 files changed, 14 insertions, 7 deletions

diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index c2c04783b..9b2205c8e 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
@@ -1,23 +1,30 @@
 FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
-        openstack-nova-console \
-    && yum clean all
+        {% set nova_consoleauth_packages = [
+            'openstack-nova-console'
+        ] %}
 
     {% elif base_distro in ['ubuntu'] %}
 
-RUN apt-get -y install --no-install-recommends \
-        nova-consoleauth \
-        python-memcache \
-    && apt-get clean
+        {% set nova_consoleauth_packages = [
+            'nova-consoleauth',
+            'python-memcache'
+        ] %}
 
     {% endif %}
+
+{{ macros.install_packages(nova_consoleauth_packages | customizable("packages")) }}
+
 {% endif %}
 
+{% block nova_consoleauth_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER nova