diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-28 06:16:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-28 06:16:55 +0000 |
| commit | adeafc9b6018e33f534633df9629672009ea8ffc (patch) | |
| tree | b3712f32fa2ced215351a774a357edf729adada2 | |
| parent | 399117b27ab35d17fd216a2ae2f391336b47a6a9 (diff) | |
| parent | 85128ef77b71806934faaafe2d70630e7f1f45c1 (diff) | |
| download | kolla-adeafc9b6018e33f534633df9629672009ea8ffc.tar.gz kolla-adeafc9b6018e33f534633df9629672009ea8ffc.zip | |
Merge "Fixes issue in neutron base after recent change"
| -rw-r--r-- | docker_templates/neutron/neutron-base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2 index 3e10aff27..f1cd75a37 100644 --- a/docker_templates/neutron/neutron-base/Dockerfile.j2 +++ b/docker_templates/neutron/neutron-base/Dockerfile.j2 @@ -36,9 +36,9 @@ RUN ln -s /neutron-* neutron \ && useradd --user-group neutron \ && pip --no-cache-dir install /neutron \ && mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \ - && cp -r etc/* /etc/neutron/ \ - && cp -r etc/neutron/* /etc/neutron/ \ - && cp etc/api-paste.ini /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/log/neutron /home/neutron |