diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-14 09:03:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-14 09:03:15 +0000 |
| commit | 3a1c41a21d664f3bd986150787d003d520e12d2e (patch) | |
| tree | bb47eaa93b2a5dd8cd6b43246ac868a7650c4281 /docker/centos/source | |
| parent | e6a28b8f1952a3cc1469145cccecff5a05c4dc4b (diff) | |
| parent | b3cdfa18c010445a6a67180f449188341142220d (diff) | |
| download | kolla-3a1c41a21d664f3bd986150787d003d520e12d2e.tar.gz kolla-3a1c41a21d664f3bd986150787d003d520e12d2e.zip | |
Merge "Murano install from source incorrectly places config"
Diffstat (limited to 'docker/centos/source')
| -rw-r--r-- | docker/centos/source/murano/murano-base/Dockerfile | 2 |
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 |