openstack/kolla-ansible
Code Issues Proposed changes

Customizations for Nova

Browse Source 
Change-Id: I7556d6cd473516c7ceb4aba7c1ba1130af2544ee
Partially-implements: blueprint third-party-plugin-support
This commit is contained in:
Paul Bourke 2016-08-05 11:50:16 +00:00
parent d8755e173f
commit d3c60d0035
12 changed files with 272 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker/nova/nova-api/Dockerfile.j2
View File

@ -1,26 +1,33 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_api_packages = [
openstack-nova-api \ 'openstack-nova-api'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_api_packages = [
nova-api \ 'nova-api',
python-memcache \ 'python-memcache'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
{% block nova_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

63
docker/nova/nova-base/Dockerfile.j2
View File

@ -1,50 +1,57 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_base_packages = [
openstack-nova-common \ 'openstack-nova-common',
python-keystoneclient \ 'python-keystoneclient',
python-cinderclient \ 'python-cinderclient',
bridge-utils \ 'bridge-utils',
openvswitch \ 'openvswitch'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_base_packages = [
nova-common \ 'nova-common',
python-nova \ 'python-nova',
bridge-utils \ 'bridge-utils',
openvswitch-switch \ 'openvswitch-switch'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_base_packages = [
bridge-utils \ 'bridge-utils',
openvswitch \ 'openvswitch'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_base_packages = [
iptables \ 'iptables',
iproute2 \ 'iproute2',
ebtables \ 'ebtables',
dnsmasq \ 'dnsmasq',
bridge-utils \ 'bridge-utils',
python-libvirt \ 'python-libvirt',
openssh-client \ 'openssh-client',
openvswitch-switch \ 'openvswitch-switch'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
ADD nova-base-archive /nova-base-source ADD nova-base-archive /nova-base-source
RUN ln -s nova-base-source/* nova \ RUN ln -s nova-base-source/* nova \
&& useradd --user-group --create-home --home-dir /var/lib/nova nova \ && useradd --user-group --create-home --home-dir /var/lib/nova nova \
@ -67,3 +74,5 @@ RUN touch /usr/local/bin/kolla_nova_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start
RUN usermod -a -G kolla nova RUN usermod -a -G kolla nova
{% block nova_base_footer %}{% endblock %}

20
docker/nova/nova-compute-ironic/Dockerfile.j2
View File

@ -1,24 +1,32 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_compute_ironic_packages = [
openstack-nova-compute \ 'openstack-nova-compute'
&& yum clean all ] %}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_compute_ironic_packages = [
nova-compute \ 'nova-compute'
&& apt-get clean ] %}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
RUN rm /etc/nova/nova-compute.conf RUN rm /etc/nova/nova-compute.conf
{% endif %} {% endif %}
{% endif %} {% endif %}
{% block nova_compute_ironic_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

102
docker/nova/nova-compute/Dockerfile.j2
View File

@ -1,68 +1,78 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_compute_packages = [
openstack-nova-compute \ 'openstack-nova-compute',
openvswitch \ 'openvswitch',
sysfsutils \ 'sysfsutils',
ceph-common \ 'ceph-common',
genisoimage \ 'genisoimage',
iscsi-initiator-utils \ 'iscsi-initiator-utils',
targetcli \ 'targetcli',
python-rtslib \ 'python-rtslib'
&& yum clean all ] %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
# ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388 # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
RUN apt-get -y install --no-install-recommends \ {% set nova_compute_packages = [
nova-compute \ 'nova-compute',
openvswitch-switch \ 'openvswitch-switch',
sysfsutils \ 'sysfsutils',
ceph-common \ 'ceph-common',
ironic-common \ 'ironic-common',
python-ironicclient \ 'python-ironicclient',
genisoimage \ 'genisoimage',
open-iscsi \ 'open-iscsi',
targetcli \ 'targetcli',
python-rtslib \ 'python-rtslib'
&& apt-get clean \ ] %}
&& rm -f /etc/nova/nova-compute.conf
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
RUN rm -f /etc/nova/nova-compute.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_compute_packages = [
libvirt-devel \ 'libvirt-devel',
openvswitch \ 'openvswitch',
qemu-img \ 'qemu-img',
sysfsutils \ 'sysfsutils',
ceph-common \ 'ceph-common',
genisoimage \ 'genisoimage',
iscsi-initiator-utils \ 'iscsi-initiator-utils',
targetcli \ 'targetcli',
python-rtslib \ 'python-rtslib'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_compute_packages = [
libvirt-dev \ 'libvirt-dev',
qemu-utils \ 'qemu-utils',
ceph-common \ 'ceph-common',
genisoimage \ 'genisoimage',
open-iscsi \ 'open-iscsi',
targetcli \ 'targetcli',
python-rtslib \ 'python-rtslib'
&& apt-get clean \ ] %}
&& mkdir -p /etc/ceph
RUN mkdir -p /etc/ceph
{% endif %} {% endif %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python
{% endif %} {% endif %}
@ -73,6 +83,8 @@ RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \
ENV PATH $PATH:/lib/udev ENV PATH $PATH:/lib/udev
{% block nova_compute_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

19
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -1,22 +1,29 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_conductor_packages = [
openstack-nova-conductor \ 'openstack-nova-conductor'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_conductor_packages = [
nova-conductor \ 'nova-conductor'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_conductor_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block nova_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

21
docker/nova/nova-consoleauth/Dockerfile.j2
View File

@ -1,23 +1,30 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_consoleauth_packages = [
openstack-nova-console \ 'openstack-nova-console'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_consoleauth_packages = [
nova-consoleauth \ 'nova-consoleauth',
python-memcache \ 'python-memcache'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_consoleauth_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block nova_consoleauth_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

87
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -1,47 +1,64 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% set libvirt_group = 'libvirtd' %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_libvirt_packages = [
libvirt-daemon \ 'libvirt-daemon',
libguestfs \ 'libguestfs',
qemu-system-x86 \ 'qemu-system-x86',
libvirt-daemon-driver-nwfilter \ 'libvirt-daemon-driver-nwfilter',
libvirt-daemon-config-nwfilter \ 'libvirt-daemon-config-nwfilter',
libvirt-daemon-driver-lxc \ 'libvirt-daemon-driver-lxc',
ceph-common \ 'ceph-common'
&& yum clean all \ ] %}
&& usermod -a -G nova qemu
{% elif base_distro == 'ubuntu' %}
{% set nova_libvirt_packages = [
'ceph-common',
'libvirt-bin',
'dmidecode',
'pm-utils',
'qemu',
'qemu-block-extra',
'ebtables',
'xen-utils-4.6'
] %}
{% set libvirt_group = 'libvirtd' %}
{% elif base_distro == 'debian' %}
{% set nova_libvirt_packages = [
'ceph-common',
'libvirt-bin',
'dmidecode',
'pm-utils',
'qemu',
'qemu-block-extra',
'ebtables',
'xen-utils-4.4',
'usermode'
] %}
{% set libvirt_group = 'libvirt' %}
{% endif %}
{{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN usermod -a -G nova qemu
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% if base_distro == 'ubuntu' %} RUN mkdir -p /etc/ceph \
{% set packages = && rm -f /etc/libvirt/qemu/networks/default.xml \
' xen-utils-4.6' /etc/libvirt/qemu/networks/autostart/default.xml \
%}
{% elif base_distro == 'debian' %}
{% set packages =
' xen-utils-4.4 usermode'
%}
{% set libvirt_group = 'libvirt' %}
{% endif %}
RUN apt-get -y install --no-install-recommends \
ceph-common \
libvirt-bin \
dmidecode \
pm-utils \
qemu \
qemu-block-extra \
ebtables \
{{ packages }} \
&& apt-get clean \
&& mkdir -p /etc/ceph \
&& rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \
&& usermod -a -G {{ libvirt_group }} nova && usermod -a -G {{ libvirt_group }} nova
{% endif %} {% endif %}
@ -49,4 +66,6 @@ RUN apt-get -y install --no-install-recommends \
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block nova_libvirt_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}

29
docker/nova/nova-network/Dockerfile.j2
View File

@ -1,32 +1,39 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_network_packages = [
openstack-nova-network \ 'openstack-nova-network',
bridge-utils \ 'bridge-utils',
initscripts \ 'initscripts'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_network_packages = [
nova-network \ 'nova-network'
&& apt-get clean ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_network_packages = [
initscripts \ 'initscripts'
&& yum clean all ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_network_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block nova_network_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

21
docker/nova/nova-novncproxy/Dockerfile.j2
View File

@ -1,21 +1,26 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_novncproxy_packages = [
novnc \ 'novnc',
openstack-nova-novncproxy \ 'openstack-nova-novncproxy'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_novncproxy_packages = [
nova-novncproxy \ 'nova-novncproxy'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_novncproxy_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD nova-novncproxy-archive /usr/share/nova-novncproxy-source ADD nova-novncproxy-archive /usr/share/nova-novncproxy-source
@ -25,6 +30,8 @@ RUN cd /usr/share \
{% endif %} {% endif %}
{% block nova_novncproxy_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

19
docker/nova/nova-scheduler/Dockerfile.j2
View File

@ -1,22 +1,29 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_scheduler_packages = [
openstack-nova-scheduler \ 'openstack-nova-scheduler'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_scheduler_packages = [
nova-scheduler \ 'nova-scheduler'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_scheduler_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block nova_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

24
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -1,28 +1,36 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% set nova_spicehtml5proxy_packages = [
openstack-nova-spicehtml5proxy \ 'openstack-nova-spicehtml5proxy',
spice-html5 \ 'spice-html5'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \ {% set nova_spicehtml5proxy_packages = [
nova-spiceproxy \ 'nova-spiceproxy'
&& apt-get clean ] %}
{% endif %} {% endif %}
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source
RUN cd /usr/share && ln -s nova-spicehtml5proxy-source/* spice-html5 RUN cd /usr/share \
&& ln -s nova-spicehtml5proxy-source/* spice-html5
{% endif %} {% endif %}
{% block nova_spicehtml5proxy_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER nova USER nova

19
docker/nova/nova-ssh/Dockerfile.j2
View File

@ -1,23 +1,24 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% import "macros.j2" as macros with context %}
RUN yum -y install \ {% set nova_ssh_packages = [
openssh-server \ 'openssh-server'
&& yum clean all ] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \ RUN mkdir -p /var/run/sshd \
openssh-server \
&& apt-get clean \
&& mkdir -p /var/run/sshd \
&& chmod 0755 /var/run/sshd && chmod 0755 /var/run/sshd
{% endif %} {% endif %}
{{ macros.install_packages(nova_ssh_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block nova_ssh_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}