From 85128ef77b71806934faaafe2d70630e7f1f45c1 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Aug 2015 05:24:41 +0000 Subject: [PATCH] Fixes issue in neutron base after recent change Change-Id: I331c9ea11c639e48898e4fbc10269081c3bccdac Implements: blueprint install-from-ubuntu --- docker_templates/neutron/neutron-base/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2 index 3e10aff270..f1cd75a374 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