aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-base
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-03-27 00:39:07 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-03 07:21:17 +0000
commit42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa (patch)
tree750a6b81d5809f325e7ca45cc5944b84350dae64 /docker/nova/nova-base
parent808d6baa448533b7dca98eca728c06d4323de22b (diff)
downloadkolla-42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa.tar.gz
kolla-42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa.zip
Implement nova-ssh container
Add a nova-ssh container to handle the `nova migrate` and `nova resize` case, in which the nova will use ssh to copy files between machines. Change-Id: Ie6675943f3aeabfbba8589d308d55b9c89d732db Closes-Bug: #1562141
Diffstat (limited to 'docker/nova/nova-base')
-rw-r--r--docker/nova/nova-base/Dockerfile.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index f9f465f16..e34f3f228 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -45,11 +45,11 @@ RUN apt-get install -y --no-install-recommends \
ADD nova-base-archive /nova-base-source
RUN ln -s nova-base-source/* nova \
- && useradd --user-group nova \
+ && useradd --user-group --home-dir /var/lib/nova nova \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /nova \
- && mkdir -p /etc/nova /home/nova /var/lib/nova \
+ && mkdir -p /etc/nova /var/lib/nova \
&& cp -r /nova/etc/nova/* /etc/nova/ \
- && chown -R nova: /etc/nova /home/nova /var/lib/nova \
+ && chown -R nova: /etc/nova /var/lib/nova \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf
COPY nova_sudoers /etc/sudoers.d/nova_sudoers