diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-23 08:05:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-23 08:05:33 +0000 |
| commit | 193500bffc5827fc9d00fa35130e54bba97cd779 (patch) | |
| tree | c8fb99eb111b4ccfd7c4e885b15a09cba29db400 /docker | |
| parent | 359f61b05a4eb5614a703e021bedcbaa10e3b9b7 (diff) | |
| parent | d2a4822fb0a1d8238ad206d523a56e8965fef826 (diff) | |
| download | kolla-193500bffc5827fc9d00fa35130e54bba97cd779.tar.gz kolla-193500bffc5827fc9d00fa35130e54bba97cd779.zip | |
Merge "Ensure the confs exists for cyborg and masakari" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/masakari/masakari-base/Dockerfile.j2 | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 7e411b535..45d03bd12 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -21,7 +21,9 @@ ADD cyborg-base-archive /cyborg-base-source ] %} RUN ln -s cyborg-base-source/* cyborg \ - && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} + && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/cyborg/ \ + && cp -r /cyborg/etc/cyborg/* /etc/cyborg/ {% endif %} diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index 65b944e6f..0dc9ff5d1 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -59,6 +59,7 @@ ADD masakari-base-archive /masakari-base-source RUN ln -s masakari-base-source/* masakari \ && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/masakari /var/www/cgi-bin/masakari \ + && cp -r /masakari/etc/masakari/* /etc/masakari/ \ && chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari {% endif %} |