From df6b98d79331593c38213ef45bb94ff622f0d158 Mon Sep 17 00:00:00 2001
From: pangliye <pangliye@inspur.com>
Date: Wed, 11 Sep 2019 09:25:13 +0800
Subject: [PATCH] Delete influxdb admin port
From version 1.3, the web admin interface is no longer available
in InfluxDB.
https://docs.influxdata.com/influxdb/v1.3/administration/differences/#web-admin-ui-removal
Change-Id: I1dce61a9c40a407882cfcd520ca491b4dee734ae
---
ansible/group_vars/all.yml | 1 -
ansible/roles/influxdb/defaults/main.yml | 5 -----
ansible/roles/influxdb/tasks/precheck.yml | 11 -----------
ansible/roles/influxdb/templates/influxdb.conf.j2 | 4 ----
4 files changed, 21 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 97e03a93de..f34c68aa9c 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -273,7 +273,6 @@ heat_api_cfn_listen_port: "{{ heat_api_cfn_port }}"
horizon_port: "80"
horizon_listen_port: "{{ horizon_port }}"
-influxdb_admin_port: "8083"
influxdb_http_port: "8086"
ironic_internal_fqdn: "{{ kolla_internal_fqdn }}"
diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml
index f5f7dd846b..72d6bca29d 100644
--- a/ansible/roles/influxdb/defaults/main.yml
+++ b/ansible/roles/influxdb/defaults/main.yml
@@ -10,11 +10,6 @@ influxdb_services:
volumes: "{{ influxdb_default_volumes + influxdb_extra_volumes }}"
dimensions: "{{ influxdb_dimensions }}"
haproxy:
- influxdb_admin:
- enabled: "{{ enable_influxdb }}"
- mode: "http"
- external: false
- port: "{{ influxdb_admin_port }}"
influxdb_http:
enabled: "{{ enable_influxdb }}"
mode: "http"
diff --git a/ansible/roles/influxdb/tasks/precheck.yml b/ansible/roles/influxdb/tasks/precheck.yml
index dd965b65e0..b8f33288b8 100644
--- a/ansible/roles/influxdb/tasks/precheck.yml
+++ b/ansible/roles/influxdb/tasks/precheck.yml
@@ -6,17 +6,6 @@
- influxdb
register: container_facts
-- name: Checking free port for Influxdb Admin
- wait_for:
- host: "{{ api_interface_address }}"
- port: "{{ influxdb_admin_port }}"
- connect_timeout: 1
- timeout: 1
- state: stopped
- when:
- - container_facts['influxdb'] is not defined
- - inventory_hostname in groups['influxdb']
-
- name: Checking free port for Influxdb Http
wait_for:
host: "{{ api_interface_address }}"
diff --git a/ansible/roles/influxdb/templates/influxdb.conf.j2 b/ansible/roles/influxdb/templates/influxdb.conf.j2
index 93f5e82494..e849afdc7b 100644
--- a/ansible/roles/influxdb/templates/influxdb.conf.j2
+++ b/ansible/roles/influxdb/templates/influxdb.conf.j2
@@ -34,10 +34,6 @@ reporting-disabled = true
store-enabled = true
store-database = "_internal"
store-interval = "10s"
-[admin]
- enabled = true
- bind-address = "{{ api_interface_address }}:{{ influxdb_admin_port }}"
- https-enabled = false
[http]
enabled = true
bind-address = "{{ api_interface_address }}:{{ influxdb_http_port }}"
--
GitLab