Drop dnsmasq_range from the undercloud source.

[apex-tripleo-heat-templates.git] / nova-compute-instance.yaml

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 6c2671c..8121736 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -10,7 +10,7 @@ Parameters:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
     Default: default
-  Flavor:
+  OvercloudComputeFlavor:
     Description: Use this flavor
     Type: String
     Default: baremetal
@@ -39,6 +39,8 @@ Parameters:
     Type: String
   RabbitHost:
     Type: String
+  RabbitUserName:
+    Type: String
   RabbitPassword:
     Type: String
     NoEcho: true
@@ -86,6 +88,31 @@ Parameters:
     Type: String
   NeutronEnableTunnelling:
     Type: String
+  StaticHosts:
+    Default: ''
+    Description: Static content to append to /etc/hosts
+    Type: String
+  LiveUpdateUserName:
+    Type: String
+    Description: The live-update username for the undercloud Glance API.
+    Default: ''
+  LiveUpdateTenantName:
+    Type: String
+    Description: The live-update tenant name for the undercloud Glance API.
+    Default: ''
+  LiveUpdateHost:
+    Type: String
+    Description: The IP address for the undercloud Glance API.
+    Default: ''
+  LiveUpdatePassword:
+    Type: String
+    Default: ''
+    Description: The live-update password for the undercloud Glance API.
+    NoEcho: true
+  LiveUpdateComputeImage:
+    Type: String
+    Description: The image ID for live-updates to the overcloud compute nodes.
+    Default: ''
 Resources:
   ComputeAccessPolicy:
     Type: OS::Heat::AccessPolicy
@@ -102,7 +129,7 @@ Resources:
         Ref: ComputeUser
   NovaCompute0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0
+    DependsOn: notCompute0Config
     Properties:
       Handle: {Ref: NovaCompute0CompletionHandle}
       Count: '1'
@@ -116,7 +143,7 @@ Resources:
         {Ref: NovaImage}
       image_update_policy:
         Ref: ImageUpdatePolicy
-      flavor: {Ref: Flavor}
+      flavor: {Ref: OvercloudComputeFlavor}
       key_name: {Ref: KeyName}
     Metadata:
       os-collect-config:
@@ -158,6 +185,7 @@ Resources:
         compute_agent: {Ref: CeilometerComputeAgent}
       glance:
         host: {Ref: GlanceHost}
+      hosts: {Ref: StaticHosts}
       keystone:
         host: {Ref: KeystoneHost}
       neutron:
@@ -184,4 +212,12 @@ Resources:
       admin-password: {Ref: AdminPassword}
       rabbit:
         host: {Ref: RabbitHost}
+        username: {Ref: RabbitUserName}
         password: {Ref: RabbitPassword}
+      live-update:
+        host: {Ref: LiveUpdateHost}
+        username: {Ref: LiveUpdateUserName}
+        password: {Ref: LiveUpdatePassword}
+        tenant-name: {Ref: LiveUpdateTenantName}
+        base_image_id: {Ref: NovaImage}
+        live_update_image_id: {Ref: LiveUpdateComputeImage}