openstack
/
kolla
Code Issues Proposed changes

Merge "Placement: Debian pkg has migration script in different path" into stable/stein

This commit is contained in:
Zuul 2019-10-02 11:20:17 +00:00 committed by Gerrit Code Review
parent 02bb2b7142 0ef702332e
commit 07750e32a0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/placement/placement-base/Dockerfile.j2
View File

@ -25,8 +25,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% if base_distro in ['debian'] %}
{% set mysql_migrate_path = '/usr/share/placement-common/mysql-migrate-db.sh' %}
{% else %}
{% set mysql_migrate_path = '/usr/share/placement/mysql-migrate-db.sh' %}
{% endif %}
{{ macros.install_packages(placement_base_packages | customizable("packages")) }} \
&& cp /usr/share/placement/mysql-migrate-db.sh /opt/ \
&& cp {{ mysql_migrate_path }} /opt/ \
&& chmod 755 /opt/mysql-migrate-db.sh
{% elif install_type == 'source' %}