Merge "Drop qdrouterd image"

9 files changed, 5 insertions, 63 deletions

diff --git a/doc/source/contributor/adding-a-new-image.rst b/doc/source/contributor/adding-a-new-image.rst
index f4bd5f633..1c04fe48c 100644
--- a/doc/source/contributor/adding-a-new-image.rst
+++ b/doc/source/contributor/adding-a-new-image.rst
@@ -82,10 +82,6 @@ be built for some distribution/architecture/build-type combinations.
            "blazar-base",
        },
 
-       'ubuntu': {
-          "qdrouterd",  # There is no qdrouterd package for ubuntu bionic
-       },
-
        'ubuntu+aarch64': {
            "kibana",        # no binary package
        },
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index b36c6ec5c..a86cd14ae 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -52,7 +52,6 @@ ovn,C,C,C,C,C,C
 ovsdpdk,N,N,C,C,N,C
 placement,C,C,N,C,N,C
 prometheus,C,C,C,C,N,C
-qdrouterd,C,C,C,C,N,N
 rabbitmq,C,C,C,C,N,C
 redis,C,C,C,C,N,C
 sahara,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 9cb8e172a..d2f4fbbaa 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -53,7 +53,6 @@ ovn,C,C,C,C,C,C
 ovsdpdk,N,N,C,C,C,C
 placement,T,T,T,T,C,T
 prometheus,C,C,C,C,C,C
-qdrouterd,C,C,N,N,N,N
 rabbitmq,T,T,T,T,C,T
 redis,C,T,C,C,C,C
 sahara,C,C,C,C,C,C
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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index fa5ade8ea..6443036cf 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -64,7 +64,6 @@ _PROFILE_OPTS = [
                     'memcached',
                     'openvswitch',
                     'proxysql',
-                    'qdrouterd',
                     'rabbitmq',
                     'redis',
                     'skydive',
@@ -871,7 +870,7 @@ USERS = {
         'uid': 42464,
         'gid': 42464,
     },
-    'qdrouterd-user': {
+    'qdrouterd-user': {   # unused user (qdrouterd dropped)
         'uid': 42465,
         'gid': 42465,
     },
diff --git a/kolla/image/build.py b/kolla/image/build.py
index a93661f6e..23dbc2d28 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -97,11 +97,9 @@ UNBUILDABLE_IMAGES = {
     },
 
     'debian': {
-        "qdrouterd",     # no qdrouterd package in Debian bullseye
     },
 
     'ubuntu': {
-        "qdrouterd",  # There is no qdrouterd package for Ubuntu
     },
 
     'ubuntu+aarch64': {
diff --git a/releasenotes/notes/drop-qdrouterd-b09f796067b431d9.yaml b/releasenotes/notes/drop-qdrouterd-b09f796067b431d9.yaml
new file mode 100644
index 000000000..702b9d38a
--- /dev/null
+++ b/releasenotes/notes/drop-qdrouterd-b09f796067b431d9.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``qdrouterd`` image has been dropped.