Add mysql innodb buffer pool size

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

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 9c49e65..2bf927f 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -15,17 +15,6 @@ Parameters:
     Default: i386
     Description: The architecture to use in Nova-BM - i386 or amd64.
     Type: String
-  ControllerAddress:
-    Default:
-      Fn::Select:
-        - 0
-        - Fn::Select:
-          - "ctlplane"
-          - Fn::GetAtt:
-            - undercloud
-            - networks
-    Description: The IP address for controller endpoints in config files.
-    Type: String
   Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
@@ -35,6 +24,14 @@ Parameters:
     Description: The password for the glance service account, used by the glance services.
     Type: String
     NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -44,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
@@ -57,7 +59,35 @@ Parameters:
     Description: The password for the nova service account, used by nova-api.
     Type: String
     NoEcho: true
+  RabbitUserName:
+    Default: guest
+    Description: The username for RabbitMQ
+    Type: String
+  RabbitPassword:
+    Default: guest
+    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:
@@ -96,7 +126,13 @@ Resources:
       admin-token: 
         Ref: AdminToken
       controller-address:
-        Ref: ControllerAddress
+        Fn::Select:
+          - 0
+          - Fn::Select:
+            - "ctlplane"
+            - Fn::GetAtt:
+              - undercloud
+              - networks
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
@@ -109,6 +145,10 @@ Resources:
         host: 127.0.0.1
         service-password:
           Ref: GlancePassword
+        notifier-strategy:
+          Ref: GlanceNotifierStrategy
+        log-file:
+          Ref: GlanceLogFile
       heat:
         admin_password:
           Ref: HeatPassword
@@ -116,23 +156,42 @@ 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:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn:
@@ -148,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
@@ -165,7 +225,14 @@ Resources:
           Ref: NeutronPassword
       rabbit:
         host: 127.0.0.1
-        password: guest
+        username:
+          Ref: RabbitUserName
+        password:
+          Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
   undercloud:
     Type: OS::Nova::Server
     Properties:
@@ -175,6 +242,8 @@ Resources:
         Ref: Flavor
       key_name:
         Ref: KeyName
+      image_update_policy:
+        Ref: ImageUpdatePolicy
     Metadata:
       os-collect-config:
         cfn: