diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-06-26 13:05:24 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-08-20 09:58:27 +0000 |
| commit | 7b2dea5506375cb868d6acb6a99b0aca916fad6c (patch) | |
| tree | 94e6067d8c33f31f32caf71049cd7d52123880ad /docker/tacker/tacker-server | |
| parent | 2d983f1ac77c48a7c09d2ff2ed60b4cdb4fa6a87 (diff) | |
| download | kolla-7b2dea5506375cb868d6acb6a99b0aca916fad6c.tar.gz kolla-7b2dea5506375cb868d6acb6a99b0aca916fad6c.zip | |
Implement tacker-conductor image, rework all tacker
Tacker is broken in pike without conductor images.
Conductor is needed to communicate with mistral for
VIM monitoring
This change rework tacker image to allow tacker-conductor
service image.
Split tacker global image into tacker-server and tacker-conductor.
Closes-Bug: #1710874
Change-Id: I52778e86e4f2c297ead8d4b09983e5e38ca88c70
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 |