Merge "Add custom public IP support to the undercloud."

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

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 1500a2e..ebc8fbd 100644 (file)
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -2,6 +2,7 @@ Resources:
   NovaComputeConfig:
     Type: OS::Heat::StructuredConfig
     Properties:
+      group: os-apply-config
       config:
         nova:
           compute_driver: { get_input: nova_compute_driver }
@@ -14,6 +15,10 @@ Resources:
           metering_secret: {get_input: ceilometer_metering_secret}
           service-password: {get_input: ceilometer_password}
           compute_agent: {get_input: ceilometer_compute_agent}
+        snmpd:
+          export_MIB: UCD-SNMP-MIB
+          readonly_user_name: {get_input: snmpd_readonly_user_name}
+          readonly_user_password: {get_input: snmpd_readonly_user_password}
         glance:
           host: {get_input: glance_host}
         hosts: {get_input: static_hosts}
@@ -45,3 +50,11 @@ Resources:
           base_image_id: {get_input: nova_image}
           live_update_image_id: {get_input: live_update_compute_image}
         completion-signal: {get_input: deploy_signal_id}
+        ntp:
+          servers:
+              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
+  NovaComputePassthrough:
+    Type: OS::Heat::StructuredConfig
+    Properties:
+      group: os-apply-config
+      config: {get_input: passthrough_config}