diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-13 13:50:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-13 13:50:46 +0000 |
| commit | db9003e39b9c622aef9c3bc7e07e60aa16217d6a (patch) | |
| tree | e6bfddb6f751b8988f8af253b18461df6947903d /docker | |
| parent | 8ad1ca0fb167e06299b50e7922b45b1fc9256322 (diff) | |
| parent | bedca5b35e8f9336182d5588d5650c1bb0682702 (diff) | |
| download | kolla-db9003e39b9c622aef9c3bc7e07e60aa16217d6a.tar.gz kolla-db9003e39b9c622aef9c3bc7e07e60aa16217d6a.zip | |
Merge "Fix keystone fernet file exchange via ssh"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/keystone/keystone-fernet/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index bd583e803..fe4c5cf1d 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -61,13 +61,13 @@ RUN echo > /etc/apache2/ports.conf {% block keystone_source_install %} ADD keystone-base-archive /keystone-base-source RUN ln -s keystone-base-source/* keystone \ - && useradd --user-group keystone \ + && useradd --user-group --create-home --home-dir /var/lib/keystone keystone \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /keystone \ - && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \ + && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 \ && cp -r /keystone/etc/* /etc/keystone/ \ && cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ && cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ - && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone + && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 {% endblock %} {% endif %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index bda73bcf3..8c058e205 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -8,11 +8,13 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% set keystone_fernet_packages = [ 'cronie', + 'openssh-clients', 'rsync' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set keystone_fernet_packages = [ 'cron', + 'openssh-client', 'rsync' ] %} {% endif %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index cf3e90851..92fa41255 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -6,9 +6,15 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - {% set keystone_ssh_packages = ['openssh-server'] %} + {% set keystone_ssh_packages = [ + 'openssh-server', + 'rsync' + ] %} {% elif base_distro in ['ubuntu', 'debian'] %} - {% set keystone_ssh_packages = ['openssh-server'] %} + {% set keystone_ssh_packages = [ + 'openssh-server', + 'rsync' + ] %} RUN mkdir -p /var/run/sshd \ && chmod 0755 /var/run/sshd |