summaryrefslogtreecommitdiff
path: root/docker/placement
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2018-12-19 21:04:49 +0100
committerEduardo Gonzalez <dabarren@gmail.com>2019-03-08 08:06:07 +0000
commit8c99d5300ecdf0f8fcc77d4dab8f60ea1b83fed7 (patch)
tree81a439a281cc945846cc248a42d9b459740655d8 /docker/placement
parentac5103ee1a5e45ef53c2187e48985977f927a3ac (diff)
downloadkolla-8c99d5300ecdf0f8fcc77d4dab8f60ea1b83fed7.tar.gz
kolla-8c99d5300ecdf0f8fcc77d4dab8f60ea1b83fed7.zip
Copy placement database migration script
mysql-migrate-db.sh script is not bundled in packages nor installed with pip. So will need to copy over some path in the host to run the db migration. Change-Id: I116277c5e11b484748784134be50c18675b28103
Diffstat (limited to 'docker/placement')
-rw-r--r--docker/placement/placement-api/extend_start.sh1
-rw-r--r--docker/placement/placement-base/Dockerfile.j230
2 files changed, 27 insertions, 4 deletions
diff --git a/docker/placement/placement-api/extend_start.sh b/docker/placement/placement-api/extend_start.sh
index a8e9635d1..f69b2eb8a 100644
--- a/docker/placement/placement-api/extend_start.sh
+++ b/docker/placement/placement-api/extend_start.sh
@@ -4,6 +4,7 @@
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
placement-manage db sync
+ placement-manage db online_data_migrations
exit 0
fi
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2
index f24adcea1..30e4a76f0 100644
--- a/docker/placement/placement-base/Dockerfile.j2
+++ b/docker/placement/placement-base/Dockerfile.j2
@@ -11,19 +11,39 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set placement_base_packages = [
+ 'mariadb',
'openstack-placement-common',
] %}
{% elif base_package_type == 'deb' %}
- {% set placement_base_packages = [] %}
-
+ {% set placement_base_packages = [
+ 'mariadb-client',
+ 'placement-common',
+ ] %}
{% endif %}
-{{ macros.install_packages(placement_base_packages | customizable("packages")) }}
+{{ macros.install_packages(placement_base_packages | customizable("packages")) }} \
+ && cp /usr/share/placement/mysql-migrate-db.sh /opt/ \
+ && chmod 755 /opt/mysql-migrate-db.sh
{% elif install_type == 'source' %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+ {% set placement_base_packages = [
+ 'mariadb',
+ ] %}
+
+ {% elif base_distro in ['debian', 'ubuntu'] %}
+
+ {% set placement_base_packages = [
+ 'mariadb-client',
+ ] %}
+
+ {% endif %}
+{{ macros.install_packages(placement_base_packages | customizable("packages")) }}
+
ADD placement-base-archive /placement-base-source
ADD plugins-archive /
@@ -35,7 +55,9 @@ RUN ln -s placement-base-source/* placement \
&& {{ macros.install_pip(placement_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/placement/ \
&& cp -r /placement/etc/placement/* /etc/placement/ \
- && chown -R placement: /etc/placement/
+ && chown -R placement: /etc/placement/ \
+ && cp /placement/tools/mysql-migrate-db.sh /opt/ \
+ && chmod 755 /opt/mysql-migrate-db.sh
{% endif %}