Convert all Glance-specific configs to nested

Change-Id: I4c9176fa6999f65c984bba402d05008d2206531d

service/files/defaults.yaml

@@ -1,15 +1,17 @@
 configs:
-  glance_api_port: 9292
-  glance_registry_port: 9191
+  glance:
+    api_port: 9292
+    registry_port: 9191
 
-  glance_db_username: glance
-  glance_db_password: password
-  glance_db_name: glance
+    db:
+      username: glance
+      password: password
+      name: glance
 
-  glance_user: glance
-  glance_password: password
+    user: glance
+    password: password
 
-  glance_debug: false
+    debug: false
 
 sources:
   openstack/glance:

service/files/glance-api.conf.j2

@@ -1,12 +1,12 @@
 [DEFAULT]
-debug = {{ glance_debug }}
+debug = {{ glance.debug }}
 
 use_syslog = False
 use_stderr = True
 use_forwarded_for = True
 
 bind_host = {{ network_topology["private"]["address"] }}
-bind_port = {{ glance_api_port }}
+bind_port = {{ glance.api_port }}
 
 registry_host = glance-registry
 
@@ -14,7 +14,7 @@ registry_host = glance-registry
 cinder_catalog_info = volume:cinder:internalURL
 
 [database]
-connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
 max_retries = -1
 
 [keystone_authtoken]
@@ -24,8 +24,8 @@ auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = {{ openstack.project_name }}
-username = {{ glance_user }}
-password = {{ glance_password }}
+username = {{ glance.user }}
+password = {{ glance.password }}
 memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
 
 

service/files/glance-registry.conf.j2

@@ -1,19 +1,19 @@
 [DEFAULT]
-debug = {{ glance_debug }}
+debug = {{ glance.debug }}
 
 use_syslog = False
 use_stderr = True
 use_forwarded_for = True
 
 bind_host = {{ network_topology["private"]["address"] }}
-bind_port = {{ glance_registry_port }}
+bind_port = {{ glance.registry_port }}
 
 registry_host = glance-registry
 
 cinder_catalog_info = volume:cinder:internalURL
 
 [database]
-connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
+connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address('mariadb') }}/{{ glance.db.name }}
 max_retries = -1
 
 [keystone_authtoken]
@@ -23,8 +23,8 @@ auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
-username = {{ glance_user }}
-password = {{ glance_password }}
+username = {{ glance.user }}
+password = {{ glance.password }}
 memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
 
 [paste_deploy]

service/glance-api.yaml

@@ -1,7 +1,7 @@
 service:
   name: glance-api
   ports:
-    - {{ glance_api_port }}
+    - {{ glance.api_port }}
   containers:
     - name: glance-api
       image: glance-api
@@ -15,8 +15,8 @@ service:
             - mariadb
           type: single
           command:
-            mysql -u root -p{{ db_root_password }} -h {{ address('mariadb') }} -e "create database {{ glance_db_name }};
-            grant all privileges on {{ glance_db_name }}.* to '{{ glance_db_username }}'@'%' identified by '{{ glance_db_password }}';"
+            mysql -u root -p{{ db_root_password }} -h {{ address('mariadb') }} -e "create database {{ glance.db.name }};
+            grant all privileges on {{ glance.db.name }}.* to '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}';"
         - name: glance-db-sync
           files:
             - glance-api
@@ -28,12 +28,12 @@ service:
           dependencies:
             - keystone
           type: single
-          command: openstack user create --domain default --password {{ glance_password  }} {{ glance_user }}
+          command: openstack user create --domain default --password {{ glance.password  }} {{ glance.user }}
         - name: glance-role-add
           dependencies:
             - glance-user-create
           type: single
-          command: openstack role add --project {{ openstack.project_name }} --user {{ glance_user }} admin
+          command: openstack role add --project {{ openstack.project_name }} --user {{ glance.user }} admin
         - name: glance-service-create
           dependencies:
             - keystone
@@ -43,17 +43,17 @@ service:
           dependencies:
             - glance-service-create
           type: single
-          command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance_api_port }}
+          command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance.api_port }}
         - name: glance-internal-endpoint-create
           dependencies:
             - glance-service-create
           type: single
-          command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance_api_port }}
+          command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance.api_port }}
         - name: glance-admin-endpoint-create
           dependencies:
             - glance-service-create
           type: single
-          command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance_api_port }}
+          command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance.api_port }}
       daemon:
         files:
           - glance-api

service/glance-registry.yaml

@@ -1,7 +1,7 @@
 service:
   name: glance-registry
   ports:
-    - {{ glance_registry_port }}
+    - {{ glance.registry_port }}
   containers:
     - name: glance-registry
       image: glance-registry