diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-20 20:42:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-20 20:42:14 +0000 |
| commit | e1c0b3ac1dc7c8c5933de9595fbaffd4407d2ee9 (patch) | |
| tree | fce084362194f394e3baff2d1243041698131d2d /docker | |
| parent | 8d387dcdb988a8166ae7faadc3f13fb0719b938a (diff) | |
| parent | df02ffe1c504719dd1838fe698cfa0ffe062fa89 (diff) | |
| download | kolla-e1c0b3ac1dc7c8c5933de9595fbaffd4407d2ee9.tar.gz kolla-e1c0b3ac1dc7c8c5933de9595fbaffd4407d2ee9.zip | |
Merge "Fix /etc files location for ironic-base building from sources"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 351d7a0e9..26007a5a1 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -21,7 +21,7 @@ RUN ln -s ironic-base-source/* ironic \ && useradd --user-group ironic \ && pip --no-cache-dir install -c requirements/upper-constraints.txt /ironic \ && mkdir -p /etc/ironic /var/log/ironic /home/ironic \ - && cp -r /ironic/etc/* /etc/ironic/ \ + && cp -r /ironic/etc/ironic/* /etc/ironic/ \ && chown -R ironic: /etc/ironic /var/log/ironic /home/ironic {% endif %} |