diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-08-01 00:12:13 +0200 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-06 08:54:21 +0200 |
| commit | aa4b49a2c350a5d7ae48d3ef36bbc351abb624ae (patch) | |
| tree | 370f0ff8c462f191272bca48ef4db4008fc28a69 /docker/cloudkitty | |
| parent | 73dd4f6cd8827b3879ffdc7bda4730b8479387ab (diff) | |
| download | kolla-aa4b49a2c350a5d7ae48d3ef36bbc351abb624ae.tar.gz kolla-aa4b49a2c350a5d7ae48d3ef36bbc351abb624ae.zip | |
Add cloudkitty containers for type source
Change-Id: I548c20afd7ce7ba27a5475c69c78c7d267ccc24b
Partially-Implements: blueprint cloudkitty-docker
Diffstat (limited to 'docker/cloudkitty')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 29 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 17 |
5 files changed, 85 insertions, 0 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 new file mode 100644 index 000000000..cdbff832d --- /dev/null +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -0,0 +1,20 @@ +FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start +RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start + +{% block cloudkitty_api_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER cloudkitty diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh new file mode 100644 index 000000000..26d4a8c36 --- /dev/null +++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh @@ -0,0 +1,9 @@ +#!/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 + cloudkitty-dbsync upgrade + cloudkitty-storage-init + exit 0 +fi diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 new file mode 100644 index 000000000..839d29b5a --- /dev/null +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -0,0 +1,29 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD cloudkitty-base-archive /cloudkitty-base-source +RUN ln -s cloudkitty-base-source/* cloudkitty \ + && useradd --user-group cloudkitty \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /cloudkitty \ + && mkdir -p /etc/cloudkitty /var/lib/cloudkitty /home/cloudkitty \ + && cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \ + && chown -R cloudkitty: /etc/cloudkitty /var/lib/cloudkitty /home/cloudkitty + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla cloudkitty \ + && touch /usr/local/bin/kolla_cloudkitty_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cloudkitty_extend_start + +{% block cloudkitty_base_footer %}{% endblock %} diff --git a/docker/cloudkitty/cloudkitty-base/extend_start.sh b/docker/cloudkitty/cloudkitty-base/extend_start.sh new file mode 100644 index 000000000..cf49f9caf --- /dev/null +++ b/docker/cloudkitty/cloudkitty-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/cloudkitty" ]]; then + mkdir -p /var/log/kolla/cloudkitty +fi +if [[ $(stat -c %a /var/log/kolla/cloudkitty) != "755" ]]; then + chmod 755 /var/log/kolla/cloudkitty +fi + +. /usr/local/bin/kolla_cloudkitty_extend_start diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 new file mode 100644 index 000000000..0b0c0d250 --- /dev/null +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block cloudkitty_processor_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER cloudkitty |
