aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-08-13 16:21:13 -0400
committerRyan Hallisey <rhallise@redhat.com>2015-08-13 16:21:13 -0400
commitb3cdfa18c010445a6a67180f449188341142220d (patch)
tree49346b0682facce2d4711ff47d669a04bb141bf3 /docker
parentb36abefd8f5e92c7792c7a8eb12f012f9f45e160 (diff)
downloadkolla-b3cdfa18c010445a6a67180f449188341142220d.tar.gz
kolla-b3cdfa18c010445a6a67180f449188341142220d.zip
Murano install from source incorrectly places config
The murano base Dockerfile is placing murano.conf in /etc/murano/murano/murano.conf. It should be in /etc/murano/murano.conf. Change-Id: Ia7f5d2f5cc6ca344c0f8f44058a4a4bf34a22546 Co-Authored-By: Ian Main <imain@redhat.com> Closes-Bug: #1484679
Diffstat (limited to 'docker')
-rw-r--r--docker/centos/source/murano/murano-base/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile
index 21de3ece3..203fc7612 100644
--- a/docker/centos/source/murano/murano-base/Dockerfile
+++ b/docker/centos/source/murano/murano-base/Dockerfile
@@ -10,6 +10,6 @@ RUN cd /murano \
&& mkdir /etc/murano \
&& cd /murano \
&& tox -e genconfig \
- && cp -r etc/murano/* /etc/murano/ \
+ && cp -r etc/murano/* /etc/ \
&& cp etc/murano/murano.conf.sample /etc/murano/murano.conf \
&& rm -rf /root/.cache