X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=9eaa8786db56a922eb742cc7f9dab40ea124193a;hb=d33a43761e87456d2ee9cf7fbf671a262dde8342;hp=f18612c87b329303e51eea05509f06848116022b;hpb=0490dd665899d3265a72965aeaf3a342275f4328;p=apex-tripleo-heat-templates.git

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index f18612c8..9eaa8786 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -15,6 +15,16 @@ Parameters:
     Default: i386
     Description: The architecture to use in Nova-BM - i386 or amd64.
     Type: String
+  CeilometerMeteringSecret:
+    Default: unset
+    Description: Secret shared by the ceilometer services.
+    Type: String
+    NoEcho: true
+  CeilometerPassword:
+    Default: unset
+    Description: The password for the ceilometer service account.
+    Type: String
+    NoEcho: true
   Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
@@ -41,6 +51,11 @@ Parameters:
     Description: The password for the Heat service account, used by the Heat services.
     Type: String
     NoEcho: true
+  ImageUpdatePolicy:
+    Default: REBUILD_PRESERVE_EPHEMERAL
+    Description: What policy to use when reconstructing instances. REBUILD for rebuilds,
+      REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    Type: String
   undercloudImage:
     Default: undercloud
     Type: String
@@ -54,6 +69,9 @@ Parameters:
     Description: The password for the nova service account, used by nova-api.
     Type: String
     NoEcho: true
+  NtpServer:
+    Type: String
+    Default: ''
   RabbitUserName:
     Default: guest
     Description: The username for RabbitMQ
@@ -72,6 +90,10 @@ Parameters:
     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
@@ -84,19 +106,19 @@ Resources:
       AllowedResources:
       - undercloudConfig
     Type: OS::Heat::AccessPolicy
-  notCompute0Key:
+  controller0Key:
     Properties:
       UserName:
         Ref: User
     Type: AWS::IAM::AccessKey
-  notCompute0CompletionCondition:
+  controller0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
     DependsOn: undercloud
     Properties:
-      Handle: {Ref: notCompute0CompletionHandle}
+      Handle: {Ref: controller0CompletionHandle}
       Count: '1'
       Timeout: '1800'
-  notCompute0CompletionHandle:
+  controller0CompletionHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
   User:
     Properties:
@@ -114,7 +136,7 @@ Resources:
       OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
       admin-password:
         Ref: AdminPassword
-      admin-token: 
+      admin-token:
         Ref: AdminToken
       controller-address:
         Fn::Select:
@@ -124,11 +146,16 @@ Resources:
             - Fn::GetAtt:
               - undercloud
               - networks
+      ceilometer:
+        db: mysql://ceilometer:unset@localhost/ceilometer
+        metering_secret: {Ref: CeilometerMeteringSecret}
+        service-password:
+          Ref: CeilometerPassword
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
       completion-handle:
-        Ref: notCompute0CompletionHandle
+        Ref: controller0CompletionHandle
       db-password: unset
       glance:
         backend: file
@@ -187,22 +214,23 @@ Resources:
       os-collect-config:
         cfn:
           access_key_id:
-            Ref: notCompute0Key
+            Ref: controller0Key
           path: undercloudConfig.Metadata
           secret_access_key:
             Fn::GetAtt:
-            - notCompute0Key
+            - controller0Key
             - SecretAccessKey
           stack_name:
             Ref: AWS::StackName
       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
@@ -213,6 +241,9 @@ Resources:
           enable_tunneling: 'False'
         service-password:
           Ref: NeutronPassword
+      ntp:
+        servers:
+            - {server: {Ref: NtpServer}, fudge: "stratum 0"}
       rabbit:
         host: 127.0.0.1
         username:
@@ -232,15 +263,17 @@ Resources:
         Ref: Flavor
       key_name:
         Ref: KeyName
+      image_update_policy:
+        Ref: ImageUpdatePolicy
     Metadata:
       os-collect-config:
         cfn:
           access_key_id:
-            Ref: notCompute0Key
+            Ref: controller0Key
           path: undercloudConfig.Metadata
           secret_access_key:
             Fn::GetAtt:
-            - notCompute0Key
+            - controller0Key
             - SecretAccessKey
           stack_name:
             Ref: AWS::StackName