diff options
| author | Bai Yongjun <byj994@163.com> | 2018-11-22 22:27:02 +0800 |
|---|---|---|
| committer | Taeha Kim <kthguru@gmail.com> | 2019-03-27 16:19:13 +0000 |
| commit | 265f643295efa50b8d5c7dc716353883d645c588 (patch) | |
| tree | 649a7e668aabc7b789da61a920b6aef6815edb4b /docker/cyborg/cyborg-base | |
| parent | 09f37541d8e57d85aa568a0ad6a23c44ef11a36e (diff) | |
| download | kolla-265f643295efa50b8d5c7dc716353883d645c588.tar.gz kolla-265f643295efa50b8d5c7dc716353883d645c588.zip | |
Add cyborg to kolla
Because kolla not have cyborg so should add this.
Implements: blueprint add-cyborg
Change-Id: I497e67e3a754fccfd2ef5a82f13ccfaf890a6fcd
Diffstat (limited to 'docker/cyborg/cyborg-base')
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 36 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-base/cyborg_sudoers | 1 | ||||
| -rwxr-xr-x | docker/cyborg/cyborg-base/extend_start.sh | 15 |
3 files changed, 52 insertions, 0 deletions
diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 new file mode 100644 index 000000000..7e411b535 --- /dev/null +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -0,0 +1,36 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block cyborg_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='cyborg') }} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD cyborg-base-archive /cyborg-base-source + +{% set cyborg_base_pip_packages = [ + '/cyborg' +] %} + +RUN ln -s cyborg-base-source/* cyborg \ + && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers + +RUN chmod 750 /etc/sudoers.d \ + && touch /usr/local/bin/kolla_cyborg_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start + +{% block cyborg_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/cyborg/cyborg-base/cyborg_sudoers b/docker/cyborg/cyborg-base/cyborg_sudoers new file mode 100644 index 000000000..63440026d --- /dev/null +++ b/docker/cyborg/cyborg-base/cyborg_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R cyborg\: /var/lib/cyborg/, /bin/chown -R cyborg\: /var/lib/cyborg/ diff --git a/docker/cyborg/cyborg-base/extend_start.sh b/docker/cyborg/cyborg-base/extend_start.sh new file mode 100755 index 000000000..10a58c626 --- /dev/null +++ b/docker/cyborg/cyborg-base/extend_start.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Create log dir for Cyborg logs +CYBORG_LOG_DIR="/var/log/kolla/cyborg" +if [[ ! -d "${CYBORG_LOG_DIR}" ]]; then + mkdir -p ${CYBORG_LOG_DIR} +fi +if [[ $(stat -c %U:%G ${CYBORG_LOG_DIR}) != "cyborg:kolla" ]]; then + chown cyborg:kolla ${CYBORG_LOG_DIR} +fi +if [[ $(stat -c %a ${CYBORG_LOG_DIR}) != "755" ]]; then + chmod 755 ${CYBORG_LOG_DIR} +fi + +. /usr/local/bin/kolla_cyborg_extend_start |
