Browse Source

Merge "Ubuntu - Nova"

changes/95/216295/9
Jenkins 7 years ago committed by Gerrit Code Review
parent
commit
7c83b0e5b9
  1. 5
      build.ini
  2. 8
      docker_templates/base/sources.list
  3. 22
      docker_templates/nova/nova-base/Dockerfile.j2
  4. 9
      docker_templates/nova/nova-compute/Dockerfile.j2
  5. 12
      docker_templates/nova/nova-libvirt/Dockerfile.j2
  6. 5
      docker_templates/nova/nova-novncproxy/Dockerfile.j2

5
build.ini

@ -63,6 +63,11 @@ type = url
location = http://tarballs.openstack.org/nova/nova-master.tar.gz
dest_filename = nova.tar
[nova-novncproxy]
type = url
location = http://github.com/kanaka/noVNC/tarball/v0.5.1
dest_filename = novnc.tar
[swift-base]
type = url
location = http://tarballs.openstack.org/swift/swift-master.tar.gz

8
docker_templates/base/sources.list

@ -6,9 +6,11 @@ deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe m
# Backports have a lower priority and must be explictly installed to be used
deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
# We need to add the Liberty repo for the updated packages they provide. The
# main ones are qemu, libvirt, and openvswitch
deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
# TODO(SamYaple): Switch this to the Liberty repo as soon as the update packages
# and actually start signing them.
# We need to add the Kilo repo for the updated packages they provide. The main
# ones are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/kilo main
# MariaDB 10.0 repo
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main

22
docker_templates/nova/nova-base/Dockerfile.j2

@ -27,26 +27,28 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
RUN apt-get install -y --no-install-recommends \
iptables \
ebtables \
dnsmasq \
bridge-utils \
python-libvirt \
openssh-client \
openvswitch-switch \
&& apt-get clean
{% endif %}
RUN pip install \
python-cinderclient \
python-keystoneclient
ADD ./nova.tar /
RUN ln -s /nova-* /nova
RUN cd /nova \
&& useradd --user-group nova \
&& pip install -r requirements.txt \
&& pip install /nova \
&& tox -egenconfig \
&& mkdir /etc/nova /var/log/nova \
&& pip install --install-option="--install-scripts=/usr/bin" /nova \
&& mkdir /etc/nova /var/log/nova /home/nova \
&& cp -r /nova/etc/nova/* /etc/nova/ \
&& chown -R nova: /etc/nova /var/log/nova \
&& chown -R nova: /etc/nova /var/log/nova /home/nova \
&& rm -rf /root/.cache
{% endif %}

9
docker_templates/nova/nova-compute/Dockerfile.j2

@ -11,17 +11,22 @@ RUN yum -y install openstack-nova-compute \
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum -y install \
sysfsutils \
libvirt-python \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends qemu-utils \
&& apt-get clean
{% endif %}
{% endif %}
COPY start.sh /
COPY config-external.sh /opt/kolla/
VOLUME [ "/sys/fs/cgroup" ]
CMD ["/start.sh"]

12
docker_templates/nova/nova-libvirt/Dockerfile.j2

@ -12,11 +12,19 @@ RUN yum -y install \
libvirt-daemon-driver-lxc \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
libvirt-bin \
dmidecode \
pm-utils \
qemu \
ebtables \
&& apt-get clean
{% endif %}
COPY start.sh /
COPY config-external.sh /opt/kolla/
VOLUME [ "/sys/fs/cgroup" ]
CMD ["/start.sh"]

5
docker_templates/nova/nova-novncproxy/Dockerfile.j2

@ -18,6 +18,11 @@ RUN yum -y install \
novnc \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
ADD novnc.tar /
RUN ln -s /kanaka-noVNC-* /usr/share/novnc
{% endif %}
{% endif %}

Loading…
Cancel
Save