Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions docker/caso/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"

{% block caso_header %}{% endblock %}

{% import "macros.j2" as macros with context %}

{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set caso_packages = [
'cronie',
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set caso_packages = [
'cron',
] %}
{% endif %}

{{ macros.install_packages(caso_packages | customizable("packages")) }}

{{ macros.configure_user(name='caso') }}

{% set caso_pip_packages = [
'caso'
] %}

# NOTE(wszumski:) Upgrade pip, otherwise we hit: ModuleNotFoundError: No module
# named 'setuptools_rust' when install latest cryptography module. Doesn't
# really make sense to use constraints as caso is not tied to an openstack
# release.
RUN mkdir -p /requirements \
&& curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }}
RUN {{ macros.install_pip(["pip"]) }}

RUN {{ macros.install_pip(caso_pip_packages | customizable("pip_packages"), constraints = false) }} \
&& mkdir -p /etc/caso \
&& chown -R caso: /etc/caso

COPY extend_start.sh /usr/local/bin/kolla_extend_start

RUN touch /usr/local/bin/kolla_caso_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_caso_extend_start

{% block caso_base_footer %}{% endblock %}
15 changes: 15 additions & 0 deletions docker/caso/extend_start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

# Create log directory, with appropriate permissions
CASO_LOG_DIR="/var/log/kolla/caso"
if [[ ! -d "$CASO_LOG_DIR" ]]; then
mkdir -p $CASO_LOG_DIR
fi
if [[ $(stat -c %U:%G ${CASO_LOG_DIR}) != "caso:kolla" ]]; then
chown caso:kolla ${CASO_LOG_DIR}
fi
if [[ $(stat -c %a ${CASO_LOG_DIR}) != "755" ]]; then
chmod 755 ${CASO_LOG_DIR}
fi

. /usr/local/bin/kolla_caso_extend_start
4 changes: 4 additions & 0 deletions kolla/common/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@
'uid': 42404,
'gid': 42404,
},
'caso-user': {
'uid': 52400,
'gid': 52400,
},
'ceilometer-user': {
'uid': 42405,
'gid': 42405,
Expand Down