diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-29 04:44:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-29 04:44:50 +0000 |
| commit | 57d3eaf70c315bd665a4533f766dbe4a2e6077f9 (patch) | |
| tree | 1c792ac7e57ed08aed6c3f6123665e0e3c3bd95d /docker/nova/nova-ssh | |
| parent | 4b7852096f432151ba00325f62d2dc8336a9660c (diff) | |
| parent | d3c60d0035d62ece4277f59c40aabe570539face (diff) | |
| download | kolla-57d3eaf70c315bd665a4533f766dbe4a2e6077f9.tar.gz kolla-57d3eaf70c315bd665a4533f766dbe4a2e6077f9.zip | |
Merge "Customizations for Nova"
Diffstat (limited to 'docker/nova/nova-ssh')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 132bd8f85..d3a433d5c 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,23 +1,24 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% import "macros.j2" as macros with context %} -RUN yum -y install \ - openssh-server \ - && yum clean all +{% set nova_ssh_packages = [ + 'openssh-server' +] %} -{% elif base_distro in ['ubuntu', 'debian'] %} +{% if base_distro in ['ubuntu', 'debian'] %} -RUN apt-get -y install --no-install-recommends \ - openssh-server \ - && apt-get clean \ - && mkdir -p /var/run/sshd \ +RUN mkdir -p /var/run/sshd \ && chmod 0755 /var/run/sshd {% endif %} +{{ macros.install_packages(nova_ssh_packages | customizable("packages")) }} + COPY extend_start.sh /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 }} |