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-base | |
| 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-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 |
