diff options
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 43 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/ceilometer_sudoers | 1 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/extend_start.sh | 15 |
3 files changed, 0 insertions, 59 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 deleted file mode 100644 index 18bd7600a..000000000 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ /dev/null @@ -1,43 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block ceilometer_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='ceilometer') }} - -{% set ceilometer_base_pip_packages = [ - '/ceilometer' -] %} - -{% set ceilometer_base_plugins_pip_packages = [ - '/plugins/*' -] %} - -ADD ceilometer-base-archive /ceilometer-base-source -ADD plugins-archive / - -COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -# NOTE(egonzalez): Remove ceilometer from constraint or will fail. -RUN ln -s ceilometer-base-source/* ceilometer \ - && {{ macros.upper_constraints_remove("ceilometer") }} \ - && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/ceilometer \ - && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \ - fi \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_ceilometer_sudoers \ - && touch /usr/local/bin/kolla_ceilometer_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block ceilometer_base_footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-base/ceilometer_sudoers b/docker/ceilometer/ceilometer-base/ceilometer_sudoers deleted file mode 100644 index dd861bb58..000000000 --- a/docker/ceilometer/ceilometer-base/ceilometer_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R ceilometer\: /var/lib/ceilometer/, /bin/chown -R ceilometer\: /var/lib/ceilometer/ diff --git a/docker/ceilometer/ceilometer-base/extend_start.sh b/docker/ceilometer/ceilometer-base/extend_start.sh deleted file mode 100644 index 4d3fe6b61..000000000 --- a/docker/ceilometer/ceilometer-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -CEILOMETER_LOG_DIR=/var/log/kolla/ceilometer - -if [[ ! -d "${CEILOMETER_LOG_DIR}" ]]; then - mkdir -p "${CEILOMETER_LOG_DIR}" -fi -if [[ $(stat -c %U:%G "${CEILOMETER_LOG_DIR}") != "ceilometer:kolla" ]]; then - chown ceilometer:kolla "${CEILOMETER_LOG_DIR}" -fi -if [[ $(stat -c %a "${CEILOMETER_LOG_DIR}") != "755" ]]; then - chmod 755 "${CEILOMETER_LOG_DIR}" -fi - -. /usr/local/bin/kolla_ceilometer_extend_start |
