openstack
/
charm-trove
Code Issues Proposed changes

Changed the way API class was called. Also changed the trove_uri in template files.

This commit is contained in:
Jonathan Arrance 2016-09-14 11:13:08 -04:00
parent a289c21110
commit 8ecce85258
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/charm/openstack/trove.py
View File

@ -149,7 +149,7 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm):
services = ['trove-api', 'trove-taskmanager', 'trove-conductor']
#not sure if this will work or not
adapters_class = charms_openstack.adapters.OpenStackRelationAdapters
adapters_class = charms_openstack.adapters.OpenStackAPIRelationAdapters
#adapters_class = TroveAdapters
default_service = 'trove-api'

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

@ -2,7 +2,8 @@
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.auth_port }}/v{{ options.keystone_api_version }}.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ identity_service.api_version }}
# The manager class to use for conductor. (string value)
conductor_manager = trove.conductor.manager.Manager

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

@ -8,7 +8,8 @@ debug = {{ options.debug }}
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.auth_port }}/v{{ options.keystone_api_version }}.0
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v{{ identity_service.api_version }}
notifier_queue_hostname = controller
backend = rabbit

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

@ -1,7 +1,7 @@
[DEFAULT]
auth_strategy = keystone
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.auth_port }}/v{{ identity_service.api_version }}
notifier_queue_hostname = controller
# Show more verbose log output (sets INFO log level output)