openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
gugug 2020-05-17 22:19:02 +08:00
parent aabd532da9
commit 2e6d2f144c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/cyborg/cyborg-base/Dockerfile.j2
View File

@ -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 %}

1
docker/masakari/masakari-base/Dockerfile.j2
View File

@ -52,6 +52,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 %}