Merge "Restore rabbit.host and add an haproxy rabbit listener"

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

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 1500a2e..cb428ea 100644 (file)
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -1,7 +1,8 @@
-Resources:
+resources:
   NovaComputeConfig:
-    Type: OS::Heat::StructuredConfig
-    Properties:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
       config:
         nova:
           compute_driver: { get_input: nova_compute_driver }
@@ -14,9 +15,14 @@ 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}
+          port: {get_input: glance_port}
+          protocol: {get_input: glance_protocol}
         keystone:
           host: {get_input: keystone_host}
         neutron:
@@ -35,7 +41,7 @@ Resources:
         admin-password: {get_input: admin_password}
         rabbit:
           host: {get_input: rabbit_host}
-          username: {get_input: rabbit_user_name}
+          username: {get_input: rabbit_username}
           password: {get_input: rabbit_password}
         live-update:
           host: {get_input: live_update_host}
@@ -45,3 +51,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}