openstack/kolla
Code Issues Proposed changes

Merge "Ensure the confs exists for cyborg and masakari"

Browse Source
This commit is contained in:
Zuul 2020-05-20 08:24:23 +00:00 committed by Gerrit Code Review
commit 81b722e1ba
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 \ 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 %} {% 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 \ RUN ln -s masakari-base-source/* masakari \
&& {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \ && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/masakari /var/www/cgi-bin/masakari \ && 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 && chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari
{% endif %} {% endif %}