diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 97e03a93de15762f29393ab3e51528237869d151..f34c68aa9c5aea48c7c2b0b77a9d6a07c12e0a2f 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 f5f7dd846b3270c8b5f8a51567625635a2d09729..72d6bca29d7bb6a06ce80268be9761b721923f6e 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 dd965b65e04886cb9589beb536d557fcf486615b..b8f33288b84eee15f670b709fdf48528e909951a 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 93f5e8249452cb3cdbdc947048c802c5f50bfc9d..e849afdc7bc66cf499044ec84ba70b47b762a75b 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 }}"