Convert all Heat configs to nested

Change-Id: I4bc568bcccf9673161ad1c805ac6739b8902f0f6

service/files/defaults.yaml

@@ -1,14 +1,16 @@
 configs:
-  heat_api_port: 8004
+  heat:
+    api_port: 8004
 
-  heat_db_username: heat
-  heat_db_password: password
-  heat_db_name: heat
+    db:
+      username: heat
+      password: password
+      name: heat
 
-  heat_user: heat
-  heat_password: password
+    user: heat
+    password: password
 
-  heat_debug: false
+    debug: false
 
 sources:
   openstack/heat:

service/files/heat.conf.j2

@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = {{ heat_debug }}
+debug = {{ heat.debug }}
 use_syslog = False
 use_stderr = True
 use_forwarded_for = True
@@ -7,7 +7,7 @@ region_name_for_services = RegionOne
 rpc_backend = rabbit
 
 [database]
-connection = mysql+pymysql://{{ heat_db_username }}:{{ heat_db_password }}@{{ address('mariadb') }}/{{ heat_db_name }}
+connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address('mariadb') }}/{{ heat.db.name }}
 
 [oslo_messaging_rabbit]
 rabbit_userid = {{ rabbitmq.user }}
@@ -23,14 +23,14 @@ auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = {{ openstack.project_name }}
-username = {{ heat_user }}
-password = {{ heat_password }}
+username = {{ heat.user }}
+password = {{ heat.password }}
 memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
 
 [trustee]
 user_domain_id = default
-password = {{ heat_password }}
-username = {{ heat_user }}
+password = {{ heat.password }}
+username = {{ heat.user }}
 auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
 auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
 auth_type = password
@@ -40,7 +40,7 @@ auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
 
 [heat_api]
 bind_host = {{ network_topology["private"]["address"] }}
-bind_port = {{ heat_api_port }}
+bind_port = {{ heat.api_port }}
 
 [cache]
 backend = oslo_cache.memcache_pool

service/heat-api.yaml

@@ -1,7 +1,7 @@
 service:
   name: heat-api
   ports:
-    - {{ heat_api_port }}
+    - {{ heat.api_port }}
   containers:
     - name: heat-api
       image: heat-api
@@ -15,8 +15,8 @@ service:
             - mariadb
           type: single
           command:
-            mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ heat_db_name }};
-            grant all privileges on {{ heat_db_name }}.* to '{{ heat_db_username }}'@'%' identified by '{{ heat_db_password }}';"
+            mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ heat.db.name }};
+            grant all privileges on {{ heat.db.name }}.* to '{{ heat.db.username }}'@'%' identified by '{{ heat.db.password }}';"
         - name: heat-db-sync
           files:
             - heat-conf
@@ -29,13 +29,13 @@ service:
             - keystone-create-project
           type: single
           command:
-            openstack user create --domain default --password {{ heat_password }} {{ heat_user }}
+            openstack user create --domain default --password {{ heat.password }} {{ heat.user }}
         - name: heat-role-add
           dependencies:
             - heat-user-create
           type: single
           command:
-            openstack role add --project {{ openstack.project_name }} --user {{ heat_user }} admin
+            openstack role add --project {{ openstack.project_name }} --user {{ heat.user }} admin
         - name: heat-service-create
           dependencies:
             - keystone-create-project
@@ -47,19 +47,19 @@ service:
             - heat-service-create
           type: single
           command:
-            openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat_api_port }}/v1/%\(tenant_id\)s
+            openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
         - name: heat-internal-endpoint-create
           dependencies:
             - heat-service-create
           type: single
           command:
-            openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat_api_port }}/v1/%\(tenant_id\)s
+            openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
         - name: heat-admin-endpoint-create
           dependencies:
             - heat-service-create
           type: single
           command:
-            openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat_api_port }}/v1/%\(tenant_id\)s
+            openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
       daemon:
         dependencies:
           - rabbitmq