diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-27 20:32:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-27 20:32:18 +0000 |
| commit | 9cf1520b407ee81e705c2d8ddb81f0a0cb0b3b21 (patch) | |
| tree | f9824014970ad77fd522c71f636c6f989a2c3af5 | |
| parent | 0fcc9a9086132be7bf3e696a4aa7b907b2471f6f (diff) | |
| parent | 2d7a14012d2c50bc9fd61fad1e74ca99ad9a98ab (diff) | |
| download | kolla-9cf1520b407ee81e705c2d8ddb81f0a0cb0b3b21.tar.gz kolla-9cf1520b407ee81e705c2d8ddb81f0a0cb0b3b21.zip | |
Merge "Placement: Debian pkg has migration script in different path"
| -rw-r--r-- | docker/placement/placement-base/Dockerfile.j2 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index d6f1978e3..2fc455b1e 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -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' %} |