diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-20 08:24:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-20 08:24:23 +0000 |
| commit | 81b722e1ba2c11265827661cad1eae7ba27cfc94 (patch) | |
| tree | 0227ab26e271b98c8e26ffff9ed35d55455ecf02 /docker/cyborg | |
| parent | 629a2955f4c7838aae526f5af8c81db96f34a8b4 (diff) | |
| parent | 2e6d2f144cd2de18193d9d87d36c95dfb75fb1b7 (diff) | |
| download | kolla-81b722e1ba2c11265827661cad1eae7ba27cfc94.tar.gz kolla-81b722e1ba2c11265827661cad1eae7ba27cfc94.zip | |
Merge "Ensure the confs exists for cyborg and masakari"
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 36b0aa007..51d39fd0f 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -23,7 +23,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 %} |
