aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2016-11-24 11:30:15 +0000
committerPaul Bourke <paul.bourke@oracle.com>2017-01-06 14:21:01 +0000
commit717fd489b384de601c5f18091b7c212c434f0a7b (patch)
tree9d3da9c12310c8255ba39493a343ec9f061f6389 /docker
parent22f55ac23d1f9e89627c86b8c6ec63fdf5d243d8 (diff)
downloadkolla-717fd489b384de601c5f18091b7c212c434f0a7b.tar.gz
kolla-717fd489b384de601c5f18091b7c212c434f0a7b.zip
neutron-vpnaas cannot run as root for redhat derivatives
The libreswan driver required by redhat derived bases currently requires root in Neutron. Remove this if condition once https://bugs.launchpad.net/neutron/+bug/1644517 is addressed. Change-Id: I3030f6c850c08558d3155f29b691ce59102d20e7
Diffstat (limited to 'docker')
-rw-r--r--docker/neutron/neutron-vpnaas-agent/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
index 32bc1508b..da30ad85b 100644
--- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
@@ -36,4 +36,9 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
{% block footer %}{% endblock %}
{{ include_footer }}
+# TODO(pbourke): The libreswan driver required by redhat derived bases
+# currently requires root in Neutron. Remove this if condition once
+# https://bugs.launchpad.net/neutron/+bug/1644517 is addressed.
+{% if base_distro in ['ubuntu', 'debian'] %}
USER neutron
+{% endif %}