diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-06 20:00:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-06 20:00:10 +0000 |
| commit | 1ad6f4a76162f745d0cbcded02de1bd08248d170 (patch) | |
| tree | e5018585b2164459cf2dc0dda5a959b51235cff6 | |
| parent | ae7a6f352d69e1f18801417d118186a1f14783d5 (diff) | |
| parent | 717fd489b384de601c5f18091b7c212c434f0a7b (diff) | |
| download | kolla-1ad6f4a76162f745d0cbcded02de1bd08248d170.tar.gz kolla-1ad6f4a76162f745d0cbcded02de1bd08248d170.zip | |
Merge "neutron-vpnaas cannot run as root for redhat derivatives"
| -rw-r--r-- | docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 | 5 |
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 1ea7fd9ba..f60c096a2 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -48,4 +48,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 %} |