Hard coded keystone API and added the trove-guestagent to trove.py

This commit is contained in:
Jonathan Arrance 2016-10-15 15:54:21 -04:00
parent 3f6773c99b
commit 6222dfd8e2
5 changed files with 5 additions and 40 deletions

View File

@ -174,20 +174,14 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm):
service_type = 'trove'
# Note that the hsm interface is optional - defined in config.yaml
# required_relations = ['shared-db', 'amqp', 'identity-service',
# 'image-service', 'cloud-compute', 'cluster',
# cinder heat swift]
# required_relations = ['shared-db', 'amqp', 'identity-service',
# 'image-service', 'cloud-compute',
# 'cinder-volume-service']
required_relations = ['shared-db', 'amqp', 'identity-service']
restart_map = {
TROVE_CONF: services,
TROVE_API_PASTE_CONF: services,
TROVE_CONDUCTOR: services,
TROVE_TASK_MANAGER: services
TROVE_TASK_MANAGER: services,
TROVE_GUEST_AGENT: services
}
ha_resources = ['vips', 'haproxy']

View File

@ -82,34 +82,6 @@ def run_db_migration():
reactive.set_state('db.synced')
trove.assess_status()
"""
MINIMAL_INTERFACES = [
'shared-db.available',
'identity-service.available',
'amqp.available',
]
def render(*args):
trove.render_configs(args)
reactive.set_state('config.complete')
trove.assess_status()
@reactive.when('charm.installed')
@reactive.when_not('cluster.available')
@reactive.when(*MINIMAL_INTERFACES)
def render_unclustered(*args):
trove.configure_ssl()
render(*args)
@reactive.when('charm.installed')
@reactive.when('cluster.available',
*MINIMAL_INTERFACES)
def render_clustered(*args):
render(*args)
"""
@reactive.when('config.changed')
def config_changed():

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 }}/v{{ identity_service.api_version }}
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.service_port }}/v2.0
# The manager class to use for conductor. (string value)
# conductor_manager = trove.conductor.manager.Manager

View File

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

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 }}/v{{ identity_service.api_version }}
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.service_port }}/v2.0
notifier_queue_hostname = controller
backend = rabbit