aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-conductor
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-29 04:44:50 +0000
committerGerrit Code Review <review@openstack.org>2016-08-29 04:44:50 +0000
commit57d3eaf70c315bd665a4533f766dbe4a2e6077f9 (patch)
tree1c792ac7e57ed08aed6c3f6123665e0e3c3bd95d /docker/nova/nova-conductor
parent4b7852096f432151ba00325f62d2dc8336a9660c (diff)
parentd3c60d0035d62ece4277f59c40aabe570539face (diff)
downloadkolla-57d3eaf70c315bd665a4533f766dbe4a2e6077f9.tar.gz
kolla-57d3eaf70c315bd665a4533f766dbe4a2e6077f9.zip
Merge "Customizations for Nova"
Diffstat (limited to 'docker/nova/nova-conductor')
-rw-r--r--docker/nova/nova-conductor/Dockerfile.j219
1 files changed, 13 insertions, 6 deletions
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index e53ba7e8f..4bb5658aa 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -1,22 +1,29 @@
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-conductor \
- && yum clean all
+ {% set nova_conductor_packages = [
+ 'openstack-nova-conductor'
+ ] %}
{% elif base_distro in ['ubuntu'] %}
-RUN apt-get -y install --no-install-recommends \
- nova-conductor \
- && apt-get clean
+ {% set nova_conductor_packages = [
+ 'nova-conductor'
+ ] %}
{% endif %}
+
+{{ macros.install_packages(nova_conductor_packages | customizable("packages")) }}
+
{% endif %}
+{% block nova_conductor_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER nova