Add support for use-internal-endpoints

Add support for use of internal endpoints for inter-service
API calls from ceilometer.

Change-Id: Id702de85fb2236f21773ee7f2fb3698012b5f16c
Closes-Bug: 1713923
This commit is contained in:
James Page 2017-09-05 11:46:26 +01:00
parent 76569acedd
commit 669bc22be9
6 changed files with 20 additions and 0 deletions

View File

@ -228,3 +228,10 @@ options:
description: |
Archive retention policy to use when Ceilometer is deployed with
Gnocchi for resource, metric and measures storage.
use-internal-endpoints:
type: boolean
default: False
description: |
Openstack mostly defaults to using public endpoints for
internal communication between services. If set to True this option
will configure services to use internal endpoints where possible.

View File

@ -116,6 +116,7 @@ CONFIG_FILES = OrderedDict([
'hook_contexts': [context.IdentityServiceContext(service=SVC,
service_user=SVC),
context.AMQPContext(ssl_dir=CEILOMETER_CONF_DIR),
context.InternalEndpointContext(),
LoggingConfigContext(),
MongoDBContext(),
CeilometerContext(),

View File

@ -19,6 +19,9 @@ os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.
os_tenant_name = {{ admin_tenant_name }}
os_username = {{ admin_user }}
os_password = {{ admin_password }}
{% if use_internal_endpoints -%}
interface = internalURL
{%- endif %}
[database]
{% if db_replset: -%}

View File

@ -20,6 +20,9 @@ os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.
os_tenant_name = {{ admin_tenant_name }}
os_username = {{ admin_user }}
os_password = {{ admin_password }}
{% if use_internal_endpoints -%}
interface = internalURL
{%- endif %}
[database]
{% if db_replset: -%}

View File

@ -36,6 +36,9 @@ project_domain_name = default
user_domain_name = default
{% endif -%}
auth_type = password
{% if use_internal_endpoints -%}
interface = internalURL
{%- endif %}
{% endif -%}
{% if db_host or db_mongo_servers -%}

View File

@ -35,6 +35,9 @@ project_domain_name = default
user_domain_name = default
{% endif -%}
auth_type = password
{% if use_internal_endpoints -%}
interface = internalURL
{%- endif %}
{% endif -%}
{% if db_host or db_mongo_servers -%}