diff --git a/src/templates/bobcat/octavia.conf b/src/templates/bobcat/octavia.conf index 762af3e3..8bf223ad 100644 --- a/src/templates/bobcat/octavia.conf +++ b/src/templates/bobcat/octavia.conf @@ -112,10 +112,32 @@ active_connection_retry_interval = {{ options.active_connection_retry_interval } {% include "parts/section-database" %} +{% if identity_service.auth_host -%} +[service_auth] +auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }} +auth_type = password +{% if identity_service.service_domain -%} +project_domain_name = {{ identity_service.service_domain }} +user_domain_name = {{ identity_service.service_domain }} +{% else %} +project_domain_name = default +user_domain_name = default +{% endif -%} +project_name = {{ identity_service.service_tenant }} +username = {{ identity_service.service_username }} +password = {{ identity_service.service_password }} +{% if options.use_memcache == true -%} +memcached_servers = {{ options.memcache_url }} +{% endif -%} +{% endif %} + {% include "parts/section-keystone-authtoken" %} {% if options.use_internal_endpoints -%} endpoint_type = internalURL {%- endif %} +{% if identity_service.auth_host -%} +auth_section = service_auth +{%- endif %} [oslo_messaging] topic = octavia @@ -162,7 +184,23 @@ region_name = {{ options.region }} {% if options.use_internal_endpoints -%} endpoint_type = internalURL {%- endif %} -auth_section = keystone_authtoken +{% if identity_service.auth_host -%} +auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }} +auth_type = password +{% if identity_service.service_domain -%} +project_domain_name = {{ identity_service.service_domain }} +user_domain_name = {{ identity_service.service_domain }} +{% else %} +project_domain_name = default +user_domain_name = default +{% endif -%} +project_name = {{ identity_service.service_tenant }} +username = {{ identity_service.service_username }} +password = {{ identity_service.service_password }} +{% if options.use_memcache == true -%} +memcached_servers = {{ options.memcache_url }} +{% endif -%} +{% endif %} {% include "parts/section-oslo-messaging-rabbit" %}