Merge "influxdb: Drop support"

11 files changed, 5 insertions, 48 deletions

diff --git a/README.rst b/README.rst
index eb2845c4d..6bf18532c 100644
--- a/README.rst
+++ b/README.rst
@@ -103,7 +103,6 @@ Infrastructure components
 Kolla provides images to deploy the following infrastructure components:
 
 - `Collectd <https://collectd.org>`__,
-  `InfluxDB <https://influxdata.com/time-series-platform/influxdb/>`__, and
   `Grafana <https://grafana.com>`__ for performance monitoring.
 - `Cron <https://cron-job.org>`__ for log rotation.
 - `Etcd <https://etcd.io/>`__ a distributed key value store that provides
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index b3adf1920..018866463 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -16,7 +16,6 @@ information about package sources.
  Name           Version           Package source information
 ==============  ================  =============================================
  Grafana        9.x                `Grafana install guide`_
- InfluxDB       1.8.x              `InfluxDB upstream repo`_
  Kibana         7.x                `Kibana install guide`_
  Logstash       7.x                `Logstash install guide`_
  MariaDB        10.11 (LTS)        `MariaDB Community downloads`_
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 04e94f169..82c372410 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -20,7 +20,6 @@ hacluster,N,U,U
 haproxy,U,U,U
 heat,U,U,U
 horizon,U,U,U
-influxdb,N,U,U
 ironic,U,U,U
 iscsid,U,U,U
 keepalived,U,U,U
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 738475b61..0e03298be 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -21,7 +21,6 @@ hacluster-pcs,N,U,U
 haproxy,T,T,U
 heat,T,T,T
 horizon,T,T,T
-influxdb,U,U,U
 ironic,T,T,U
 iscsid,T,T,U
 keepalived,T,T,U
diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2
deleted file mode 100644
index 060973dd6..000000000
--- a/docker/influxdb/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block influxdb_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='influxdb') }}
-
-{{ macros.enable_extra_repos(['influxdb']) }}
-
-{% set influxdb_packages = ['influxdb'] %}
-{{ macros.install_packages(influxdb_packages | customizable("packages")) }}
-
-COPY influxdb_sudoers /etc/sudoers.d/kolla_influxdb_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/kolla_influxdb_sudoers \
-    && chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block influxdb_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER influxdb
diff --git a/docker/influxdb/extend_start.sh b/docker/influxdb/extend_start.sh
deleted file mode 100644
index 42a3c4607..000000000
--- a/docker/influxdb/extend_start.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-INFLUXDB_LOG_DIR=/var/log/kolla/influxdb
-
-if [[ ! -d "${INFLUXDB_LOG_DIR}" ]]; then
-    mkdir -p ${INFLUXDB_LOG_DIR}
-fi
-if [[ $(stat -c %a ${INFLUXDB_LOG_DIR}) != "755" ]]; then
-    chmod 755 ${INFLUXDB_LOG_DIR}
-fi
diff --git a/docker/influxdb/influxdb_sudoers b/docker/influxdb/influxdb_sudoers
deleted file mode 100644
index a9757b264..000000000
--- a/docker/influxdb/influxdb_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R influxdb\: /var/lib/influxdb, /bin/chown -R influxdb\: /var/lib/influxdb
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 6a0796bfb..b480a041c 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -98,7 +98,6 @@ ENV PATH {{ venv_path }}/bin:$PATH
 {% set kolla_toolbox_pip_packages = [
         'ansible-core==2.20.*',
         'cmd2',
-        'influxdb',
         'openstacksdk',
         'os-client-config',
         'pbr',
diff --git a/kolla/common/config.py b/kolla/common/config.py
index a4208df6a..b1f325188 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -88,7 +88,6 @@ _PROFILE_OPTS = [
                     'cloudkitty',
                     'designate',
                     'gnocchi',
-                    'influxdb',
                     'ironic',
                     'kuryr',
                     'magnum',
diff --git a/kolla/common/users.py b/kolla/common/users.py
index ec21b0658..cbbc147b0 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -89,7 +89,7 @@ USERS = {
         'uid': 42420,
         'gid': 42420,
     },
-    'influxdb-user': {
+    'influxdb-user': {  # unused user (influxdb dropped)
         'uid': 42421,
         'gid': 42421,
     },
diff --git a/releasenotes/notes/drop-influxdb-cb3161a1e04fa38e.yaml b/releasenotes/notes/drop-influxdb-cb3161a1e04fa38e.yaml
new file mode 100644
index 000000000..47800626e
--- /dev/null
+++ b/releasenotes/notes/drop-influxdb-cb3161a1e04fa38e.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for building ``influxdb`` container images has been dropped.