From d2a4822fb0a1d8238ad206d523a56e8965fef826 Mon Sep 17 00:00:00 2001 From: gugug Date: Sun, 17 May 2020 22:19:02 +0800 Subject: Ensure the confs exists for cyborg and masakari 1. When cyborg images build completed, the /etc/cyborg folder is not exits, and there is not confs, especially the api-paste.ini 2. When masakari images build completed, it's configs is missing, this ps add them together cyborg should keep consistence with the other images[1], this PS to add it. [1]: https://github.com/openstack/kolla/blob/master/docker/nova/nova-base/Dockerfile.j2#L137 Change-Id: I8a802617952f80cfb9f906398054ef6d17559589 (cherry picked from commit 2e6d2f144cd2de18193d9d87d36c95dfb75fb1b7) --- docker/cyborg/cyborg-base/Dockerfile.j2 | 4 +++- docker/masakari/masakari-base/Dockerfile.j2 | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docker') 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 %} -- cgit v1.2.3