diff options
| author | caowei <cao.wei@99cloud.net> | 2016-09-03 00:40:00 +0800 |
|---|---|---|
| committer | caowei <cao.wei@99cloud.net> | 2016-11-04 21:59:50 +0800 |
| commit | f270f0c5897e10e2f3c18730db46867802eca117 (patch) | |
| tree | 543855ac46df5658459a1c0ea06d65c83b527737 /docker/solum | |
| parent | 32e2121b4f0f7a8bba52ce2995ee5e45bc6bd3c7 (diff) | |
| download | kolla-f270f0c5897e10e2f3c18730db46867802eca117.tar.gz kolla-f270f0c5897e10e2f3c18730db46867802eca117.zip | |
Add solum container
Change-Id: If2a959a037c1c67f48a6f9e56e49c435050b0aab
Partially-implements: bp solum-support
Diffstat (limited to 'docker/solum')
| -rw-r--r-- | docker/solum/solum-api/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/solum/solum-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 29 | ||||
| -rw-r--r-- | docker/solum/solum-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/solum/solum-conductor/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/solum/solum-deployer/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/solum/solum-worker/Dockerfile.j2 | 17 |
7 files changed, 118 insertions, 0 deletions
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 new file mode 100644 index 000000000..2a5de0e66 --- /dev/null +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -0,0 +1,20 @@ +FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block solum_api_header %}{% endblock %} + +{% 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_solum_extend_start +RUN chmod 755 /usr/local/bin/kolla_solum_extend_start + +{% block solum_api_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER solum diff --git a/docker/solum/solum-api/extend_start.sh b/docker/solum/solum-api/extend_start.sh new file mode 100644 index 000000000..fd9625c83 --- /dev/null +++ b/docker/solum/solum-api/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 + solum-db-manage --config-file /etc/solum/solum.conf upgrade head + exit 0 +fi diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 new file mode 100644 index 000000000..2fae22e9d --- /dev/null +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -0,0 +1,29 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block solum_base_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD solum-base-archive /solum-base-source +RUN ln -s solum-base-source/* solum \ + && useradd --user-group solum \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /solum \ + && mkdir -p /etc/solum /home/solum \ + && cp -r /solum/etc/solum/* /etc/solum/ \ + && chown -R solum: /etc/solum /home/solum + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla solum \ + && touch /usr/local/bin/kolla_solum_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start + +{% block solum_base_footer %}{% endblock %} diff --git a/docker/solum/solum-base/extend_start.sh b/docker/solum/solum-base/extend_start.sh new file mode 100644 index 000000000..b80d4bfe0 --- /dev/null +++ b/docker/solum/solum-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/solum" ]]; then + mkdir -p /var/log/kolla/solum +fi +if [[ $(stat -c %a /var/log/kolla/solum) != "755" ]]; then + chmod 755 /var/log/kolla/solum +fi + +. /usr/local/bin/kolla_solum_extend_start diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 new file mode 100644 index 000000000..a2c69ea0f --- /dev/null +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block solum_conductor_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block solum_conductor_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER solum diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 new file mode 100644 index 000000000..44cb8ada4 --- /dev/null +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block solum_deployer_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block solum_deployer_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER solum diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 new file mode 100644 index 000000000..509c03058 --- /dev/null +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -0,0 +1,17 @@ +FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block solum_worker_header %}{% endblock %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +{% block solum_worker_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER solum |
