openstack/kolla-ansible
Code Issues Proposed changes

Merge "Construct service configuration urls using kolla_internal_fqdn"

Browse Source
This commit is contained in:
Zuul 2020-02-25 20:44:38 +00:00 committed by Gerrit Code Review
commit 52cb500fbd
10 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/elasticsearch/tasks/upgrade.yml
View File

@ -6,7 +6,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/_cluster/settings" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/_cluster/settings"
method: PUT method: PUT
status_code: 200 status_code: 200
return_content: yes return_content: yes
@ -20,7 +20,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/_flush/synced" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/_flush/synced"
method: POST method: POST
status_code: 200 status_code: 200
return_content: yes return_content: yes

4
ansible/roles/grafana/defaults/main.yml
View File

@ -39,7 +39,7 @@ grafana_data_sources:
database: "telegraf" database: "telegraf"
name: "telegraf" name: "telegraf"
type: "influxdb" type: "influxdb"
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ influxdb_http_port }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ influxdb_http_port }}"
access: "proxy" access: "proxy"
basicAuth: false basicAuth: false
elasticsearch: elasticsearch:
@ -48,7 +48,7 @@ grafana_data_sources:
name: "elasticsearch" name: "elasticsearch"
type: "elasticsearch" type: "elasticsearch"
access: "proxy" access: "proxy"
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}"
database: "flog-*" database: "flog-*"
jsonData: jsonData:
esVersion: 5 esVersion: 5

6
ansible/roles/grafana/tasks/post_config.yml
View File

@ -4,7 +4,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ grafana_server_port }}/login" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ grafana_server_port }}/login"
status_code: 200 status_code: 200
register: result register: result
until: result.get('status') == 200 until: result.get('status') == 200
@ -17,7 +17,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ grafana_server_port }}/api/datasources" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ grafana_server_port }}/api/datasources"
method: POST method: POST
user: "{{ grafana_admin_username }}" user: "{{ grafana_admin_username }}"
password: "{{ grafana_admin_password }}" password: "{{ grafana_admin_password }}"
@ -38,7 +38,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ grafana_server_port }}/api/user/helpflags/1" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ grafana_server_port }}/api/user/helpflags/1"
method: PUT method: PUT
user: "{{ grafana_admin_username }}" user: "{{ grafana_admin_username }}"
password: "{{ grafana_admin_password }}" password: "{{ grafana_admin_password }}"

2
ansible/roles/grafana/templates/prometheus.yaml.j2
View File

@ -5,5 +5,5 @@ datasources:
type: prometheus type: prometheus
access: proxy access: proxy
orgId: 1 orgId: 1
url: http://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ prometheus_port }} url: http://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ prometheus_port }}
version: 1 version: 1

10
ansible/roles/kibana/tasks/post_config.yml
View File

@ -10,7 +10,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
method: PUT method: PUT
body: "{{ kibana_default_index_options | to_json }}" body: "{{ kibana_default_index_options | to_json }}"
body_format: json body_format: json
@ -28,7 +28,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
status_code: 200 status_code: 200
register: result register: result
until: result.status == 200 until: result.status == 200
@ -41,7 +41,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/config/*" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/config/*"
method: PUT method: PUT
body: body:
defaultIndex: "{{ kibana_default_index_pattern }}" defaultIndex: "{{ kibana_default_index_pattern }}"
@ -56,7 +56,7 @@
module_args: module_args:
headers: headers:
Content-Type: application/json Content-Type: application/json
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
method: GET method: GET
register: kibana_default_indexes register: kibana_default_indexes
run_once: true run_once: true
@ -75,7 +75,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/index-pattern/{{ kibana_default_index_pattern }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/index-pattern/{{ kibana_default_index_pattern }}"
method: PUT method: PUT
body: "{{ kibana_default_index | to_json }}" body: "{{ kibana_default_index | to_json }}"
body_format: json body_format: json

2
ansible/roles/kibana/templates/kibana.yml.j2
View File

@ -2,7 +2,7 @@ kibana.defaultAppId: "{{ kibana_default_app_id }}"
logging.dest: /var/log/kolla/kibana/kibana.log logging.dest: /var/log/kolla/kibana/kibana.log
server.port: {{ kibana_server_port }} server.port: {{ kibana_server_port }}
server.host: "{{ api_interface_address }}" server.host: "{{ api_interface_address }}"
elasticsearch.url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ elasticsearch_port }}" elasticsearch.url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}"
elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }} elasticsearch.requestTimeout: {{ kibana_elasticsearch_request_timeout }}
elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }} elasticsearch.shardTimeout: {{ kibana_elasticsearch_shard_timeout }}
elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}" elasticsearch.ssl.verificationMode: "{{ 'full' if kibana_elasticsearch_ssl_verify | bool else 'none' }}"

2
ansible/roles/monasca/defaults/main.yml
View File

@ -189,7 +189,7 @@ monasca_grafana_data_sources:
name: "Monasca API" name: "Monasca API"
type: "monasca-datasource" type: "monasca-datasource"
access: "proxy" access: "proxy"
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_api_port }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_api_port }}"
isDefault: True isDefault: True
basicAuth: false basicAuth: false
jsonData: jsonData:

14
ansible/roles/monasca/tasks/post_config.yml
View File

@ -4,7 +4,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/login" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/login"
status_code: 200 status_code: 200
register: result register: result
until: result.get('status') == 200 until: result.get('status') == 200
@ -22,7 +22,7 @@
module_name: uri module_name: uri
module_args: module_args:
method: GET method: GET
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs"
user: '{{ monasca_grafana_admin_username }}' user: '{{ monasca_grafana_admin_username }}'
password: '{{ monasca_grafana_admin_password }}' password: '{{ monasca_grafana_admin_password }}'
return_content: true return_content: true
@ -36,7 +36,7 @@
module_name: uri module_name: uri
module_args: module_args:
method: POST method: POST
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs"
user: '{{ monasca_grafana_admin_username }}' user: '{{ monasca_grafana_admin_username }}'
password: '{{ monasca_grafana_admin_password }}' password: '{{ monasca_grafana_admin_password }}'
body_format: json body_format: json
@ -52,7 +52,7 @@
module_name: uri module_name: uri
module_args: module_args:
method: GET method: GET
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs/name/{{ monasca_grafana_control_plane_org }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs/name/{{ monasca_grafana_control_plane_org }}"
user: '{{ monasca_grafana_admin_username }}' user: '{{ monasca_grafana_admin_username }}'
password: '{{ monasca_grafana_admin_password }}' password: '{{ monasca_grafana_admin_password }}'
return_content: true return_content: true
@ -66,7 +66,7 @@
module_name: uri module_name: uri
module_args: module_args:
method: POST method: POST
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs/{{ monasca_grafana_conf_org.json.id }}/users" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/orgs/{{ monasca_grafana_conf_org.json.id }}/users"
user: '{{ monasca_grafana_admin_username }}' user: '{{ monasca_grafana_admin_username }}'
password: '{{ monasca_grafana_admin_password }}' password: '{{ monasca_grafana_admin_password }}'
body: body:
@ -87,7 +87,7 @@
module_name: uri module_name: uri
module_args: module_args:
method: POST method: POST
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/user/using/{{ monasca_grafana_conf_org.json.id }}" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/user/using/{{ monasca_grafana_conf_org.json.id }}"
user: '{{ monasca_grafana_admin_username }}' user: '{{ monasca_grafana_admin_username }}'
password: '{{ monasca_grafana_admin_password }}' password: '{{ monasca_grafana_admin_password }}'
force_basic_auth: true force_basic_auth: true
@ -98,7 +98,7 @@
kolla_toolbox: kolla_toolbox:
module_name: uri module_name: uri
module_args: module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/datasources" url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ monasca_grafana_server_port }}/api/datasources"
method: POST method: POST
user: "{{ monasca_grafana_admin_username }}" user: "{{ monasca_grafana_admin_username }}"
password: "{{ monasca_grafana_admin_password }}" password: "{{ monasca_grafana_admin_password }}"

2
ansible/roles/prometheus/defaults/main.yml
View File

@ -108,7 +108,7 @@ prometheus_mysql_exporter_database_user: "{% if use_preconfigured_databases | bo
# 'service_name:blackbox_exporter_module:endpoint' for example: # 'service_name:blackbox_exporter_module:endpoint' for example:
# #
# prometheus_blackbox_exporter_targets: # prometheus_blackbox_exporter_targets:
# - 'glance:os_endpoint:http://{{ kolla_external_vip_address | put_address_in_context('url') }}:{{ glance_api_port}}' # - 'glance:os_endpoint:http://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ glance_api_port}}'
# #
# For a list of modules see the alertmanager config. # For a list of modules see the alertmanager config.
prometheus_blackbox_exporter_endpoints: [] prometheus_blackbox_exporter_endpoints: []

6
releasenotes/notes/fix-rest-urls-fqdn-a555e8299fe34efb.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Construct service REST API urls using ``kolla_internal_fqdn`` instead of
``kolla_internal_vip_address``. Otherwise SSL validation will fail when
certificates are issued using domain names.