X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=undercloud-vm-nova-config.yaml;h=1fb8abb327f80a3ddd0b14334b72a212d26f7423;hb=fb1de4faa2cf572acc24dccbdc026f12a47d32b3;hp=99da805941405fa50481fd7ba2123820be615640;hpb=441b60b43c5acff0ead6203dc7e28621db363c82;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-vm-nova-config.yaml b/undercloud-vm-nova-config.yaml
index 99da8059..1fb8abb3 100644
--- a/undercloud-vm-nova-config.yaml
+++ b/undercloud-vm-nova-config.yaml
@@ -1,12 +1,14 @@
-Resources:
+resources:
   undercloudNovaConfig:
-    Type: OS::Heat::StructuredConfig
-    Properties:
+    type: OS::Heat::StructuredConfig
+    properties:
       config:
         nova:
           compute_hostname: undercloud
-          compute_driver: baremetal.driver.BareMetalDriver
-          db: mysql://nova:unset@localhost/nova
+          compute_driver: {get_param: NovaComputeDriver}
+          compute_manager: {get_param: NovaComputeManager}
+          scheduler_host_manager: {get_param: NovaSchedulerHostManager}
+          db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova']]}
           default_ephemeral_format: ext4
           host: 127.0.0.1
           metadata-proxy: false
@@ -15,7 +17,7 @@ Resources:
             reserved_host_memory_mb: 0
           baremetal:
             arch: {get_input: nova_arch}
-            db: mysql://nova:unset@localhost/nova_bm
+            db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova_bm']]}
             power_manager: {get_input: power_manager}
             pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
             virtual_power: