diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 5761d8ba1..19e0c23c7 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -106,7 +106,6 @@
             - { name: glance, file: glance.conf }
             - { name: grafana, file: grafana.ini }
             - { name: heat, file: heat.conf }
-            - { name: influxdb, file: influxdb.conf }
             - { name: inspector, file: ironic-inspector.conf }
             - { name: ironic, file: ironic.conf }
             - { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf }
@@ -211,7 +210,6 @@
       kolla_extra_grafana: "{{ kolla_extra_config.grafana | default }}"
       kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"
       kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"
-      kolla_extra_influxdb: "{{ kolla_extra_config.influxdb | default }}"
       kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
       kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}"
       kolla_extra_kafka: "{{ kolla_extra_config.kafka | default }}"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index ae90e4223..301f96aa3 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -81,9 +81,6 @@ kolla_enable_horizon:
 # Whether to enable InfluxDB.
 kolla_enable_influxdb:
 
-# Free form extra configuration to append to influxdb.conf.
-kolla_extra_influxdb:
-
 ###############################################################################
 # Ironic configuration.
 
diff --git a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
index d52d17b33..8a15d0bc8 100644
--- a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
+++ b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
@@ -44,7 +44,6 @@ def test_service_config_directory(host, path):
      'grafana',
      'heat',
      'horizon',
-     'influxdb',
      'ironic',
      'kafka',
      'magnum',
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index fb409033e..64740f60a 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -40,9 +40,6 @@ provisioner:
           foo=bar
         kolla_enable_horizon: true
         kolla_enable_influxdb: true
-        kolla_extra_influxdb: |
-          [extra-influxdb.conf]
-          foo=bar
         kolla_enable_ironic: true
         kolla_extra_ironic: |
           [extra-ironic.conf]
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
index 3d8f71607..6e0a3e32d 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
@@ -36,7 +36,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'grafana',
      'heat',
      'horizon',
-     'influxdb',
      'ironic',
      'kafka',
      'keystone',
@@ -65,7 +64,6 @@ def test_service_config_directory(host, path):
      'glance.conf',
      'grafana.ini',
      'heat.conf',
-     'influxdb.conf',
      'ironic.conf',
      'ironic-inspector.conf',
      'kafka.server.properties',
diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
index ea1ff395d..8946eeec0 100644
--- a/ansible/roles/kolla-openstack/tasks/config.yml
+++ b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -20,7 +20,6 @@
     - { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }
     - { src: grafana.ini.j2, dest: grafana.ini, enabled: "{{ kolla_enable_grafana }}" }
     - { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }
-    - { src: influxdb.conf.j2, dest: influxdb.conf, enabled: "{{ kolla_enable_influxdb }}" }
     - { src: ironic.conf.j2, dest: ironic.conf, enabled: "{{ kolla_enable_ironic }}" }
     - { src: ironic-dnsmasq.conf.j2, dest: ironic/ironic-dnsmasq.conf, enabled: "{{ kolla_enable_ironic }}" }
     - { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" }
diff --git a/ansible/roles/kolla-openstack/templates/influxdb.conf.j2 b/ansible/roles/kolla-openstack/templates/influxdb.conf.j2
deleted file mode 100644
index ee314f710..000000000
--- a/ansible/roles/kolla-openstack/templates/influxdb.conf.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-# {{ ansible_managed }}
-
-{% if kolla_extra_influxdb %}
-#######################
-# Extra configuration
-#######################
-
-{{ kolla_extra_influxdb }}
-{% endif %}
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 953612747..f0ede72fc 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -60,9 +60,9 @@ kolla_openstack_custom_config:
     patterns: "*"
     enabled: "{{ kolla_enable_horizon }}"
   # InfluxDB.
-  - src: "{{ kolla_extra_config_path }}/influxdb"
-    dest: "{{ kolla_node_custom_config_path }}/influxdb"
-    patterns: "*"
+  - src: "{{ kolla_extra_config_path }}/"
+    dest: "{{ kolla_node_custom_config_path }}/"
+    patterns: "influx*"
     enabled: "{{ kolla_enable_influxdb }}"
   # Storm.
   - src: "{{ kolla_extra_config_path }}/storm"