diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-22 03:56:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-22 03:56:20 +0000 |
| commit | 187b1f08f586327e5c47a0bed3760a575daa1287 (patch) | |
| tree | 68513efdf5fb46a2a5b6d8f7f8827931606c11b5 /docker/tacker/tacker-server | |
| parent | f673da392698d057eeae97ed52ee0f99a76c3ee9 (diff) | |
| parent | 7b2dea5506375cb868d6acb6a99b0aca916fad6c (diff) | |
| download | kolla-187b1f08f586327e5c47a0bed3760a575daa1287.tar.gz kolla-187b1f08f586327e5c47a0bed3760a575daa1287.zip | |
Merge "Implement tacker-conductor image, rework all tacker"
Diffstat (limited to 'docker/tacker/tacker-server')
| -rw-r--r-- | docker/tacker/tacker-server/Dockerfile.j2 | 32 | ||||
| -rw-r--r-- | docker/tacker/tacker-server/extend_start.sh | 8 |
2 files changed, 40 insertions, 0 deletions
diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 new file mode 100644 index 000000000..1e7bae11c --- /dev/null +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -0,0 +1,32 @@ +FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block tacker_server_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set tacker_server_packages = [ + 'openstack-tacker' + ] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} + +{{ macros.install_packages(tacker_server_packages | customizable("packages")) }} + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start +RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start + +{% block tacker_server_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER tacker diff --git a/docker/tacker/tacker-server/extend_start.sh b/docker/tacker/tacker-server/extend_start.sh new file mode 100644 index 000000000..311d21f71 --- /dev/null +++ b/docker/tacker/tacker-server/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head + exit 0 +fi |
