Remove neutron- prefix from db info as this is a neutron charm so neutron is implicit
This commit is contained in:
parent
895d91474a
commit
b89d546bee
|
@ -22,11 +22,11 @@ options:
|
|||
default: openstack
|
||||
type: string
|
||||
description: Rabbitmq vhost
|
||||
neutron-database-user:
|
||||
database-user:
|
||||
default: neutron
|
||||
type: string
|
||||
description: Username for Neutron database access (if enabled)
|
||||
neutron-database:
|
||||
database:
|
||||
default: neutron
|
||||
type: string
|
||||
description: Database name for Neutron (if enabled)
|
||||
|
|
|
@ -11,7 +11,7 @@ class NeutronPostgresqlDBContext(context.PostgresqlDBContext):
|
|||
|
||||
def __init__(self):
|
||||
super(NeutronPostgresqlDBContext,
|
||||
self).__init__(config('neutron-database'))
|
||||
self).__init__(config('database'))
|
||||
|
||||
class IdentityServiceContext(context.IdentityServiceContext):
|
||||
|
||||
|
|
|
@ -98,9 +98,8 @@ def db_joined():
|
|||
log(e, level=ERROR)
|
||||
raise Exception(e)
|
||||
|
||||
# XXX: Renaming relations from quantum_* to neutron_* here.
|
||||
relation_set(neutron_database=config('neutron-database'),
|
||||
neutron_username=config('neutron-database-user'),
|
||||
relation_set(neutron_database=config('database'),
|
||||
neutron_username=config('database-user'),
|
||||
neutron_hostname=unit_get('private-address'))
|
||||
|
||||
|
||||
|
@ -113,7 +112,7 @@ def pgsql_neutron_db_joined():
|
|||
log(e, level=ERROR)
|
||||
raise Exception(e)
|
||||
|
||||
relation_set(database=config('neutron-database'))
|
||||
relation_set(database=config('database'))
|
||||
|
||||
|
||||
@hooks.hook('shared-db-relation-changed')
|
||||
|
|
|
@ -50,9 +50,8 @@ BASE_RESOURCE_MAP = OrderedDict([
|
|||
'services': ['neutron-server'],
|
||||
'contexts': [context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
|
||||
context.SharedDBContext(
|
||||
user=config('neutron-database-user'),
|
||||
database=config('neutron-database'),
|
||||
relation_prefix='neutron',
|
||||
user=config('database-user'),
|
||||
database=config('database'),
|
||||
ssl_dir=NEUTRON_CONF_DIR),
|
||||
neutron_api_context.NeutronPostgresqlDBContext(),
|
||||
neutron_api_context.IdentityServiceContext(),
|
||||
|
|
Loading…
Reference in New Issue