diff options
| author | Andrey Shestakov <ashestakov@mirantis.com> | 2016-01-14 18:34:12 +0200 |
|---|---|---|
| committer | Andrey Shestakov <ashestakov@mirantis.com> | 2016-01-20 12:14:16 +0000 |
| commit | ccc2ad57eb0bc6a53de3af5a5df8db834d42a0a0 (patch) | |
| tree | be50a71cd638a3ef4a526371a517cf20f9c305aa /docker | |
| parent | dfead6d6830551211ede783077e1b612c837aa9c (diff) | |
| download | kolla-ccc2ad57eb0bc6a53de3af5a5df8db834d42a0a0.tar.gz kolla-ccc2ad57eb0bc6a53de3af5a5df8db834d42a0a0.zip | |
Ironic ubuntu binary container
Change-Id: I94ef03c11657d36261f3ddc63056422f84ec2c6a
Partially-Implements: blueprint binary-ubuntu
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 |
4 files changed, 23 insertions, 2 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 211b42f57..c83449285 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-ironic-api \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + ironic-api \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index b4f5037c8..499f34623 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-ironic-common \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + ironic-common \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 4372ff6ef..fac65c930 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -7,6 +7,14 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-ironic-conductor \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + ironic-conductor \ + qemu-utils \ + ipmitool \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} @@ -14,8 +22,7 @@ RUN yum -y install openstack-ironic-conductor \ RUN yum -y install ipmitool \ && yum clean all - {% endif %} - {% if base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ qemu-utils \ 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 %} |