diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 14:27:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 14:27:13 +0000 |
| commit | be9a8789a698b45f9eb423c599fc603b80472bc9 (patch) | |
| tree | 0689a24a8738d770a1269f7da9c0a74005a11097 /docker/neutron | |
| parent | 29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff) | |
| parent | 58eee09c15dea81ec51bb366af23681de70ceaa1 (diff) | |
| download | kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip | |
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 480ee2c3d..d6ec683ea 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -5,6 +5,12 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='neutron') }} + +{% if base_distro in ['ubuntu', 'debian'] %} +{{ macros.debian_haproxy_existing_user_fix() }} +{% endif %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -77,14 +83,13 @@ RUN mkdir -p /usr/share/neutron \ ADD neutron-base-archive /neutron-base-source ADD plugins-archive / RUN ln -s neutron-base-source/* neutron \ - && useradd --user-group neutron \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \ - && mkdir -p /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \ + && mkdir -p /etc/neutron /usr/share/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ && cp -r /neutron/etc/neutron/* /etc/neutron/ \ && cp /neutron/etc/api-paste.ini /usr/share/neutron \ && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ - && chown -R neutron: /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \ + && chown -R neutron: /etc/neutron /usr/share/neutron \ && 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/neutron/rootwrap.conf \ && if [ "$(ls /plugins)" ]; then \ pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ @@ -95,8 +100,7 @@ RUN ln -s neutron-base-source/* neutron \ COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla neutron \ - && chmod 750 /etc/sudoers.d \ +RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_neutron_sudoers \ && touch /usr/local/bin/kolla_neutron_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 383120501..87269f58f 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -21,8 +21,7 @@ COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_metadata_sudoers COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_neutron_metadata_sudoers \ - && usermod -a -G kolla neutron + && chmod 440 /etc/sudoers.d/kolla_neutron_metadata_sudoers {% block neutron_metadata_agent_footer %}{% endblock %} {% block footer %}{% endblock %} |
