Fix Puppet Configuring NetApp Cinder Backend

[apex-tripleo-heat-templates.git] / undercloud-source.yaml

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 67c3e6d..6fe2066 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -74,9 +74,10 @@ parameters:
         }
     type: json
   Flavor:
-    default: baremetal
     description: Flavor to request when deploying.
     type: string
+    constraints:
+      - custom_constraint: nova.flavor
   GlanceLogFile:
     description: The filepath of the file to use for logging messages from Glance.
     type: string
@@ -179,6 +180,9 @@ parameters:
     description: The password for the nova service account, used by nova-api.
     type: string
     hidden: true
+  NeutronDVR:
+    default: 'False'
+    type: string
   NtpServer:
     type: string
     default: ''
@@ -256,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:
@@ -268,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:
@@ -287,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}
@@ -310,8 +314,10 @@ 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
             public_interface:
               get_param: NeutronPublicInterface
             public_interface_raw_device:
@@ -340,7 +346,7 @@ resources:
             - value
         ntp:
           servers:
-            - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+            - {server: {get_param: NtpServer}}
   undercloudPassthroughConfig:
     type: OS::Heat::StructuredConfig
     properties: