From 7b2dea5506375cb868d6acb6a99b0aca916fad6c Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Mon, 26 Jun 2017 13:05:24 +0200 Subject: 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 --- docker/tacker/tacker-server/Dockerfile.j2 | 32 +++++++++++++++++++++++++++++ docker/tacker/tacker-server/extend_start.sh | 8 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 docker/tacker/tacker-server/Dockerfile.j2 create mode 100644 docker/tacker/tacker-server/extend_start.sh (limited to 'docker/tacker/tacker-server') 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 -- cgit v1.2.3