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-base | |
| 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-base')
| -rw-r--r-- | docker/tacker/tacker-base/Dockerfile.j2 | 47 | ||||
| -rw-r--r-- | docker/tacker/tacker-base/extend_start.sh | 10 |
2 files changed, 57 insertions, 0 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 new file mode 100644 index 000000000..d3a9f4701 --- /dev/null +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -0,0 +1,47 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block tacker_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='tacker') }} + +{% if install_type == 'binary' %} + + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set tacker_base_packages = [ + 'openstack-tacker-common' + ] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} + +{{ macros.install_packages(tacker_base_packages | customizable("packages")) }} + +{% elif install_type == 'source' %} + +ADD tacker-base-archive /tacker-base-source + +{% set tacker_base_pip_packages = [ + '/tacker' +] %} + +RUN ln -s tacker-base-source/* tacker \ + && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/tacker \ + && cp -r /tacker/etc/tacker/* /etc/tacker \ + && chown -R tacker: /etc/tacker + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_tacker_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start + +{% block tacker_base_footer %}{% endblock %} diff --git a/docker/tacker/tacker-base/extend_start.sh b/docker/tacker/tacker-base/extend_start.sh new file mode 100644 index 000000000..a3b7db8d3 --- /dev/null +++ b/docker/tacker/tacker-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/tacker" ]]; then + mkdir -p /var/log/kolla/tacker +fi +if [[ $(stat -c %a /var/log/kolla/tacker) != "755" ]]; then + chmod 755 /var/log/kolla/tacker +fi + +. /usr/local/bin/kolla_tacker_extend_start |
