diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-28 19:16:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-28 19:16:59 +0000 |
| commit | 154950815dbe9f38ce1f61d06e5d56c9660a89f2 (patch) | |
| tree | b69a8491b0c035d4131a9429fa1d834ac1bc5719 /docker/cyborg/cyborg-api | |
| parent | 83e8be4f0597c4572f58a1052010d3660064cdb9 (diff) | |
| parent | 265f643295efa50b8d5c7dc716353883d645c588 (diff) | |
| download | kolla-154950815dbe9f38ce1f61d06e5d56c9660a89f2.tar.gz kolla-154950815dbe9f38ce1f61d06e5d56c9660a89f2.zip | |
Merge "Add cyborg to kolla"
Diffstat (limited to 'docker/cyborg/cyborg-api')
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 42 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-api/extend_start.sh | 16 |
2 files changed, 58 insertions, 0 deletions
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 new file mode 100644 index 000000000..0d1857220 --- /dev/null +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -0,0 +1,42 @@ +FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block cyborg_api_header %}{% endblock %} +{% 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' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set cyborg_api_packages = [ + 'mod_ssl', + 'mod_wsgi' + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set cyborg_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi' + ] %} + {% endif %} + +{% endif %} + +{{ macros.install_packages(cyborg_api_packages | customizable("packages")) }} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ + && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf + +{% elif base_distro in ['debian', 'ubuntu'] %} +RUN echo > /etc/apache2/ports.conf + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start +RUN chmod 755 /usr/local/bin/kolla_cyborg_extend_start + +{% block cyborg_api_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh new file mode 100644 index 000000000..a96619d93 --- /dev/null +++ b/docker/cyborg/cyborg-api/extend_start.sh @@ -0,0 +1,16 @@ +#!/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 + cyborg-dbsync + exit 0 +fi + +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # Loading Apache2 ENV variables + . /etc/apache2/envvars + rm -rf /var/run/apache2/* +else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* +fi |
