Convert all Keystone-specific configs to nested

Change-Id: I393f8898657543a8c4536159e9a6d773b13cefbf

service/files/defaults.yaml

@@ -1,20 +1,23 @@
 configs:
-  keystone_public_port: 5000
-  keystone_admin_port: 35357
+  keystone:
+    debug: false
+    public_port: 5000
+    admin_port: 35357
 
-  keystone_db_password: password
-  keystone_db_name: keystone
-  keystone_db_username: keystone
+    db:
+      password: password
+      name: keystone
+      username: keystone
 
-  openstack_user_password: password
-  openstack_user_name: admin
-  openstack_project_name: admin
-  openstack_role_name: admin
+    wsgi:
+      processes: 6
+      threads: 3
 
-  keystone_debug: false
-
-  keystone_wsgi_processes: 6
-  keystone_wsgi_threads: 3
+  openstack:
+    user_password: password
+    user_name: admin
+    project_name: admin
+    role_name: admin
 
 sources:
   openstack/keystone:

service/files/keystone.conf.j2

@@ -1,10 +1,10 @@
 [DEFAULT]
-debug = {{ keystone_debug }}
+debug = {{ keystone.debug }}
 use_syslog = False
 use_stderr = True
 
 [database]
-connection = mysql+pymysql://{{ keystone_db_username }}:{{ keystone_db_password }}@{{ address('mariadb') }}/{{ keystone_db_name }}
+connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address('mariadb') }}/{{ keystone.db.name }}
 max_retries = -1
 max_overflow = 60
 

service/files/wsgi-keystone.conf.j2

@@ -1,9 +1,9 @@
 {% set venv_path = '/var/lib/microservices/venv/lib/python2.7/site-packages' %}
-Listen {{ keystone_public_port }}
-Listen {{ keystone_admin_port }}
+Listen {{ keystone.public_port }}
+Listen {{ keystone.admin_port }}
 
-<VirtualHost *:{{ keystone_public_port }}>
-    WSGIDaemonProcess keystone-public processes={{ keystone_wsgi_processes }} threads={{ keystone_wsgi_threads }} user=keystone group=keystone display-name=%{GROUP} python-path={{ venv_path }}
+<VirtualHost *:{{ keystone.public_port }}>
+    WSGIDaemonProcess keystone-public processes={{ keystone.wsgi.processes }} threads={{ keystone.wsgi.threads }} user=keystone group=keystone display-name=%{GROUP} python-path={{ venv_path }}
     WSGIProcessGroup keystone-public
     WSGIScriptAlias / /var/www/cgi-bin/keystone/public
     WSGIApplicationGroup %{GLOBAL}
@@ -17,7 +17,7 @@ Listen {{ keystone_admin_port }}
     CustomLog "/var/log/ccp/keystone/keystone-access.log" access
 </VirtualHost>
 
-<VirtualHost *:{{ keystone_admin_port }}>
+<VirtualHost *:{{ keystone.admin_port }}>
     WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ venv_path }}
     WSGIProcessGroup keystone-admin
     WSGIScriptAlias / /var/www/cgi-bin/keystone/admin

service/keystone.yaml

@@ -1,8 +1,8 @@
 service:
   name: keystone
   ports:
-    - {{ keystone_public_port }}
-    - {{ keystone_admin_port }}
+    - {{ keystone.public_port }}
+    - {{ keystone.admin_port }}
   containers:
     - name: keystone
       image: keystone
@@ -22,8 +22,8 @@ service:
             - mariadb
           type: single
           command:
-            mysql -u root -p{{ db_root_password }} -h {{ address('mariadb') }} -e "create database {{ keystone_db_name }};
-            grant all privileges on {{ keystone_db_name }}.* to '{{ keystone_db_username }}'@'%' identified by '{{ keystone_db_password }}'"
+            mysql -u root -p{{ db_root_password }} -h {{ address('mariadb') }} -e "create database {{ keystone.db.name }};
+            grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'"
         - name: keystone-db-sync
           files:
             - keystone-conf
@@ -38,14 +38,14 @@ service:
             - keystone-db-sync
           type: single
           command: keystone-manage bootstrap
-                   --bootstrap-password {{ openstack_user_password }}
-                   --bootstrap-username {{ openstack_user_name }}
-                   --bootstrap-project-name {{ openstack_project_name }}
-                   --bootstrap-role-name {{ openstack_role_name }}
+                   --bootstrap-password {{ openstack.user_password }}
+                   --bootstrap-username {{ openstack.user_name }}
+                   --bootstrap-project-name {{ openstack.project_name }}
+                   --bootstrap-role-name {{ openstack.role_name }}
                    --bootstrap-service-name keystone --bootstrap-region-id RegionOne
-                   --bootstrap-admin-url http://{{ address('keystone') }}:{{ keystone_admin_port }}
-                   --bootstrap-public-url http://{{ address('keystone') }}:{{ keystone_public_port }}
-                   --bootstrap-internal-url http://{{ address('keystone') }}:{{ keystone_public_port }}
+                   --bootstrap-admin-url http://{{ address('keystone') }}:{{ keystone.admin_port }}
+                   --bootstrap-public-url http://{{ address('keystone') }}:{{ keystone.public_port }}
+                   --bootstrap-internal-url http://{{ address('keystone') }}:{{ keystone.public_port }}
 
       daemon:
         dependencies: