X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=2bf927f86b409d0c4e24dd39e137a566b9c937cc;hb=0acac15f4ead9e5c6bec98411bbdda21f876d582;hp=805239a9c2e6b56234b62dc4f91ff9f5f2b2edc6;hpb=fa06cba2e40e84133452673728ca208348bb64a6;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 805239a9..2bf927f8 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -41,6 +41,11 @@ Parameters:
     Description: The password for the Heat service account, used by the Heat services.
     Type: String
     NoEcho: true
+  ImageUpdatePolicy:
+    Default: REPLACE
+    Description: What policy to use when reconstructing instances. REBUILD for rebuilds,
+      REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    Type: String
   undercloudImage:
     Default: undercloud
     Type: String
@@ -63,7 +68,26 @@ Parameters:
     Description: The password for RabbitMQ
     Type: String
     NoEcho: true
+  RabbitCookieSalt:
+    Type: String
+    Default: unset
+    Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
+  HeatStackDomainAdminPassword:
+    Description: Password for heat_domain_admin user.
+    Type: String
+    Default: ''
+    NoEcho: true
+  MysqlInnodbBufferPoolSize:
+    Description: Specifies the size of the buffer pool in megabytes.
+    Type: Number
+    Default: 100
 Resources:
+  RabbitCookie:
+    Type: OS::Heat::RandomString
+    Properties:
+      length: 20
+      salt:
+        Ref: RabbitCookieSalt
   AccessPolicy:
     Properties:
       AllowedResources:
@@ -132,6 +156,7 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
+        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
         watch_server_url:
           Fn::Join:
             - ''
@@ -182,11 +207,12 @@ Resources:
       keystone:
         db: mysql://keystone:unset@localhost/keystone
         host: 127.0.0.1
+      mysql:
+        innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
       neutron:
         host: 127.0.0.1
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
-          dnsmasq_range: [192.0.2.25, 192.0.2.44]
           public_interface:
             Ref: NeutronPublicInterface
           physical_bridge: br-ctlplane
@@ -203,6 +229,10 @@ Resources:
           Ref: RabbitUserName
         password:
           Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
   undercloud:
     Type: OS::Nova::Server
     Properties:
@@ -212,6 +242,8 @@ Resources:
         Ref: Flavor
       key_name:
         Ref: KeyName
+      image_update_policy:
+        Ref: ImageUpdatePolicy
     Metadata:
       os-collect-config:
         cfn: