change glance-db config option to database and db-user to databaser-user

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.

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'))