X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=6fe2066d24fcc4b27636fe8761f7f59b33b5b890;hb=601cf3631f8039d13948473f03a6642d3dc9d8e9;hp=0b1261464c4bca372a1ae72af9875b404729bb05;hpb=6f16c9638384ad2e2972b6b9cd2a3c6e72ef58bf;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 0b126146..6fe2066d 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -260,7 +260,7 @@ resources:
           recheck_interval : 5
           quorum_policy : ignore
         ceilometer:
-          db: mysql://ceilometer:unset@localhost/ceilometer
+          db: {list_join: ['', ['mysql://ceilometer:', {get_param: CeilometerPassword}, '@localhost/ceilometer']]}
           debug: {get_param: Debug}
           metering_secret: {get_param: CeilometerMeteringSecret}
           snmpd_readonly_user_name:
@@ -272,7 +272,7 @@ resources:
         db-password: unset
         glance:
           backend: file
-          db: mysql://glance:unset@localhost/glance
+          db: {list_join: ['', ['mysql://glance:', {get_param: GlancePassword}, '@localhost/glance']]}
           debug: {get_param: Debug}
           host: 127.0.0.1
           port:
@@ -291,14 +291,14 @@ resources:
           admin_tenant_name: service
           admin_user: heat
           auth_encryption_key: unset___________
-          db: mysql://heat:unset@localhost/heat
+          db: {list_join: ['', ['mysql://heat:', {get_param: HeatPassword}, '@localhost/heat']]}
           debug: {get_param: Debug}
           stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
           watch_server_url: {get_input: heat.watch_server_url}
           metadata_server_url: {get_input: heat.metadata_server_url}
           waitcondition_server_url: {get_input: heat.waitcondition_server_url}
         keystone:
-          db: mysql://keystone:unset@localhost/keystone
+          db: {list_join: ['', ['mysql://keystone:', {get_param: AdminToken}, '@localhost/keystone']]}
           debug: {get_param: Debug}
           host: 127.0.0.1
           ca_certificate: {get_param: KeystoneCACertificate}
@@ -314,7 +314,7 @@ resources:
         neutron:
           debug: {get_param: Debug}
           host: 127.0.0.1
-          ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
+          ovs_db: {list_join: ['', ['mysql://neutron:', {get_param: NeutronPassword}, '@localhost/ovs_neutron?charset=utf8']]}
           ovs:
             local_ip:
               get_input: controller_host
@@ -346,7 +346,7 @@ resources:
             - value
         ntp:
           servers:
-            - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+            - {server: {get_param: NtpServer}}
   undercloudPassthroughConfig:
     type: OS::Heat::StructuredConfig
     properties: