Merge "Add BlockStorage0Config Resource"

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

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 3ac148c..cb83f91 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -24,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
@@ -33,6 +41,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
@@ -46,7 +59,31 @@ 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
 Resources:
+  RabbitCookie:
+    Type: OS::Heat::RandomString
+    Properties:
+      length: 20
+      salt:
+        Ref: RabbitCookieSalt
   AccessPolicy:
     Properties:
       AllowedResources:
@@ -104,6 +141,10 @@ Resources:
         host: 127.0.0.1
         service-password:
           Ref: GlancePassword
+        notifier-strategy:
+          Ref: GlanceNotifierStrategy
+        log-file:
+          Ref: GlanceLogFile
       heat:
         admin_password:
           Ref: HeatPassword
@@ -111,23 +152,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://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn:
@@ -147,7 +207,6 @@ Resources:
         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
@@ -160,7 +219,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:
@@ -170,6 +236,8 @@ Resources:
         Ref: Flavor
       key_name:
         Ref: KeyName
+      image_update_policy:
+        Ref: ImageUpdatePolicy
     Metadata:
       os-collect-config:
         cfn: