Skip to content

Commit 07750e3

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Placement: Debian pkg has migration script in different path" into stable/stein
2 parents 02bb2b7 + 0ef7023 commit 07750e3

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

docker/placement/placement-base/Dockerfile.j2

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2525
] %}
2626
{% endif %}
2727

28+
{% if base_distro in ['debian'] %}
29+
{% set mysql_migrate_path = '/usr/share/placement-common/mysql-migrate-db.sh' %}
30+
{% else %}
31+
{% set mysql_migrate_path = '/usr/share/placement/mysql-migrate-db.sh' %}
32+
{% endif %}
33+
2834
{{ macros.install_packages(placement_base_packages | customizable("packages")) }} \
29-
&& cp /usr/share/placement/mysql-migrate-db.sh /opt/ \
35+
&& cp {{ mysql_migrate_path }} /opt/ \
3036
&& chmod 755 /opt/mysql-migrate-db.sh
3137

3238
{% elif install_type == 'source' %}

0 commit comments

Comments
 (0)