From 91d3c57fd148f96fca626d6850d670e5c5a2bc04 Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Wed, 30 Dec 2015 02:23:33 +0100 Subject: Nova ubuntu binary container Change-Id: I1bb609dc4d77250c45ffa7e00ea603d24cbcfd6e Partially-Implements: blueprint binary-ubuntu --- docker/nova/nova-api/Dockerfile.j2 | 7 +++++++ docker/nova/nova-base/Dockerfile.j2 | 8 ++++++++ docker/nova/nova-compute-ironic/Dockerfile.j2 | 6 ++++++ docker/nova/nova-compute/Dockerfile.j2 | 12 ++++++++++++ docker/nova/nova-conductor/Dockerfile.j2 | 6 ++++++ docker/nova/nova-consoleauth/Dockerfile.j2 | 7 +++++++ docker/nova/nova-network/Dockerfile.j2 | 6 ++++++ docker/nova/nova-novncproxy/Dockerfile.j2 | 6 ++++++ docker/nova/nova-scheduler/Dockerfile.j2 | 6 ++++++ docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 6 ++++++ 10 files changed, 70 insertions(+) (limited to 'docker') diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index ef5fd1b44..8f5680b42 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -7,6 +7,13 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-api \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-api \ + python-memcache \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 65666cc46..86d399c56 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -15,6 +15,14 @@ RUN yum -y install \ bridge-utils \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-common \ + python-nova \ + bridge-utils \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 585101793..654fdeda6 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-nova-compute \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-compute \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 650cf2942..029a435c7 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -11,6 +11,18 @@ RUN yum -y install \ ceph-common \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +# ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388 +RUN apt-get install -y --no-install-recommends \ + nova-compute \ + openvswitch-switch \ + sysfsutils \ + ceph-common \ + ironic-common \ + python-ironicclient \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index effb7a120..98cab0695 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-conductor \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-conductor \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index 427144f01..dedcf8f1f 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -7,6 +7,13 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-console \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-consoleauth \ + python-memcache \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 index e0624fb63..251924f5c 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/Dockerfile.j2 @@ -10,6 +10,12 @@ RUN yum -y install \ initscripts \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-network \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index d216895f3..90d6934a6 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -9,6 +9,12 @@ RUN yum -y install \ openstack-nova-novncproxy \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-novncproxy \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 0057a7cd9..24443038d 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-scheduler \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-scheduler \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 046277662..e0d194795 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-spicehtml5proxy \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-spiceproxy \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} -- cgit v1.2.3