From 3d474af86f3fba60147e4401782d00c820489819 Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Thu, 20 Jun 2013 14:26:12 -0400 Subject: [PATCH] change glance-db config option to database and db-user to databaser-user --- config.yaml | 4 ++-- hooks/glance_relations.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.yaml b/config.yaml index 4cfbb413..f9088226 100644 --- a/config.yaml +++ b/config.yaml @@ -14,11 +14,11 @@ options: Note that updating this setting to a source that is known to provide a later version of OpenStack will trigger a software upgrade. - db-user: + database-user: default: glance type: string description: Database username - glance-db: + database: default: glance type: string description: Glance database name. diff --git a/hooks/glance_relations.py b/hooks/glance_relations.py index 9e15bc44..d3c59d60 100755 --- a/hooks/glance_relations.py +++ b/hooks/glance_relations.py @@ -96,7 +96,7 @@ def install_hook(): def db_joined(): - relation_set(database=config["glance-db"], username=config["db-user"], + relation_set(database=config['database'], username=config['database-user'], hostname=unit_get('private-address'))