diff options
| author | Andrey Shestakov <ashestakov@mirantis.com> | 2015-11-20 21:34:22 +0200 |
|---|---|---|
| committer | Andrey Shestakov <ashestakov@mirantis.com> | 2015-11-20 21:46:42 +0200 |
| commit | df02ffe1c504719dd1838fe698cfa0ffe062fa89 (patch) | |
| tree | c4a75bbfd0d446e37df3470e9976791b32d1d113 /docker | |
| parent | 296d17af2d0572cc02c7cbc6d13463d7f7274c90 (diff) | |
| download | kolla-df02ffe1c504719dd1838fe698cfa0ffe062fa89.tar.gz kolla-df02ffe1c504719dd1838fe698cfa0ffe062fa89.zip | |
Fix /etc files location for ironic-base building from sources
Ironic config files should be palced to /etc/ironic/*
Closes-Bug: #1518433
Change-Id: Ic82dbb9a28ed3adb6bfca2d0f715da3a7bbc4698
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 %} |