aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-22 10:16:53 +0000
committerGerrit Code Review <review@openstack.org>2016-01-22 10:16:53 +0000
commit18d536c868d441a19950280788d3808b3ba0ca04 (patch)
tree54036c264c75c28e841ec8bd8eabba888238b7d8 /docker/nova
parent801f84ed11d51661d31bc3a4736e4840dc147360 (diff)
parentccc2ad57eb0bc6a53de3af5a5df8db834d42a0a0 (diff)
downloadkolla-18d536c868d441a19950280788d3808b3ba0ca04.tar.gz
kolla-18d536c868d441a19950280788d3808b3ba0ca04.zip
Merge "Ironic ubuntu binary container"
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-compute-ironic/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 654fdeda6..f8c9c518d 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/Dockerfile.j2
@@ -14,6 +14,8 @@ RUN apt-get install -y --no-install-recommends \
nova-compute \
&& apt-get clean
+RUN rm /etc/nova/nova-compute.conf
+
{% endif %}
{% endif %}