diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 42 | ||||
| -rw-r--r-- | docker/qdrouterd/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/qdrouterd/qdrouterd_sudoers | 1 |
3 files changed, 0 insertions, 53 deletions
diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 deleted file mode 100644 index d0d5bbb64..000000000 --- a/docker/qdrouterd/Dockerfile.j2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block qdrouterd_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='qdrouterd') }} - -{{ macros.enable_extra_repos(['qdrouterd']) }} - -{% block qdrouterd_install %} -{% if base_package_type == 'rpm' %} - {% set qdrouterd_packages = [ - 'cyrus-sasl-lib', - 'cyrus-sasl-plain', - 'qpid-dispatch-router', - 'qpid-dispatch-tools' - ] %} - -{% if base_distro in ['centos'] %} -# make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo -{{ macros.disable_extra_repos(['extras', 'opstools']) }} -{% endif %} - -{{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} - -{% endif %} -{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY qdrouterd_sudoers /etc/sudoers.d/kolla_qdrouterd_sudoers -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_qdrouterd_sudoers - -{% block qdrouterd_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER qdrouterd diff --git a/docker/qdrouterd/extend_start.sh b/docker/qdrouterd/extend_start.sh deleted file mode 100644 index 829b0758b..000000000 --- a/docker/qdrouterd/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Create log directory, with appropriate permissions -QDROUTERD_LOG_DIR="/var/log/kolla/qdrouterd" -if [[ ! -d "${QDROUTERD_LOG_DIR}" ]]; then - mkdir -p ${QDROUTERD_LOG_DIR} -fi -if [[ $(stat -c %a ${QDROUTERD_LOG_DIR}) != "755" ]]; then - chmod 755 ${QDROUTERD_LOG_DIR} -fi diff --git a/docker/qdrouterd/qdrouterd_sudoers b/docker/qdrouterd/qdrouterd_sudoers deleted file mode 100644 index dbcd341a4..000000000 --- a/docker/qdrouterd/qdrouterd_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R qdrouterd\: /var/lib/qdrouterd, /bin/chown -R qdrouterd\: /var/lib/qdrouterd |
