openstack
/
charm-trove
Code Issues Proposed changes

hard coded the keystone api version and made sure the auth service ports were correct.

This commit is contained in:
Jonathan Arrance 2016-10-15 20:49:53 -04:00
parent 6222dfd8e2
commit da56f75c0d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/mitaka/trove-conductor.conf
View File

@ -3,7 +3,7 @@ verbose = {{ options.verbose }}
debug = {{ options.debug }}
#trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.service_port }}/v2.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v2.0
# The manager class to use for conductor. (string value)
# conductor_manager = trove.conductor.manager.Manager

2
src/templates/mitaka/trove-guestagent.conf
View File

@ -6,7 +6,7 @@ log_file = trove-guestagent.log
log_dir = /var/log/trove/
ignore_users = os_admin
control_exchange = trove
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v2.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.service_port }}/v2.0
#=========== RPC Configuration ======================
# URL representing the messaging driver to use and its full configuration.

2
src/templates/mitaka/trove-taskmanager.conf
View File

@ -10,7 +10,7 @@ update_status_on_fail = True
log_dir = /var/log/trove
#trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ options.keystone_api_version }}.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.service_port }}/v2.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v2.0
notifier_queue_hostname = controller
backend = rabbit