1 files changed, 61 insertions, 1 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 99c2e11c..8cbf7759 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -6,7 +6,44 @@ Parameters:
     Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     Type: String
     NoEcho: true
-  KeyName: 
+  ExtraConfig:
+    Description: |
+      Additional configuration to inject into the cluster. The JSON should have
+      the following structure:
+        {"FILEKEY":
+          {"config":
+            [{"section": "SECTIONNAME",
+              "values":
+                [{"option": "OPTIONNAME",
+                  "value": "VALUENAME"
+                 }
+                ]
+             }
+            ]
+          }
+        }
+      For instance:
+        {"nova":
+          {"config":
+            [{"section": "default",
+              "values":
+                [{"option": "compute_manager",
+                  "value": "ironic.nova.compute.manager.ClusterComputeManager"
+                 }
+                ]
+             },
+             {"section": "cells",
+              "values":
+                [{"option": "driver",
+                  "value": "nova.cells.rpc_driver.CellsRPCDriver"
+                 }
+                ]
+             }
+            ]
+          }
+        }
+    Type: Json
+  KeyName:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
     Default: default
@@ -21,6 +58,9 @@ Parameters:
   NovaImage:
     Type: String
     Default: overcloud-compute
+  NtpServer:
+    Type: String
+    Default: ''
   KeystoneHost:
     Type: String
   NeutronFlatNetworks:
@@ -59,6 +99,15 @@ Parameters:
     Description: The password for the ceilometer service account.
     Type: String
     NoEcho: true
+  SnmpdReadonlyUserName:
+    Default: ro_snmp_user
+    Description: The user name for SNMPd with readonly rights running on all Overcloud nodes
+    Type: String
+  SnmpdReadonlyUserPassword:
+    Default: unset
+    Description: The user password for SNMPd with readonly rights running on all Overcloud nodes
+    Type: String
+    NoEcho: true
   NovaComputeDriver:
     Type: String
     Default: libvirt.LibvirtDriver
@@ -139,6 +188,8 @@ Resources:
         ceilometer_metering_secret: {Ref: CeilometerMeteringSecret}
         ceilometer_password: {Ref: CeilometerPassword}
         ceilometer_compute_agent: {Ref: CeilometerComputeAgent}
+        snmpd_readonly_user_name: {Ref: SnmpdReadonlyUserName}
+        snmpd_readonly_user_password: {Ref: SnmpdReadonlyUserPassword}
         glance_host: {Ref: GlanceHost}
         static_hosts: {Ref: StaticHosts}
         keystone_host: {Ref: KeystoneHost}
@@ -163,3 +214,12 @@ Resources:
         live_update_tenant_name: {Ref: LiveUpdateTenantName}
         nova_image: {Ref: NovaImage}
         live_update_image_id: {Ref: LiveUpdateComputeImage}
+        ntp_server: {Ref: NtpServer}
+  NovaCompute0Passthrough:
+    Type: OS::Heat::StructuredDeployment
+    Properties:
+      config: {Ref: NovaComputePassthrough}
+      server: {Ref: NovaCompute0}
+      signal_transport: NO_SIGNAL
+      input_values:
+        passthrough_config: {Ref: ExtraConfig}