Parametrize Swift partition power

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

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index c426443..90387d7 100644 (file)
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -1,7 +1,7 @@
-Resources:
+resources:
   NovaComputeConfig:
-    Type: OS::Heat::StructuredConfig
-    Properties:
+    type: OS::Heat::StructuredConfig
+    properties:
       group: os-apply-config
       config:
         nova:
@@ -9,6 +9,7 @@ Resources:
           compute_libvirt_type: { get_input: nova_compute_libvirt_type }
           db: {get_input: nova_dsn}
           host: {get_input: nova_api_host}
+          public_ip: {get_input: nova_public_ip}
           service-password: {get_input: nova_password}
         ceilometer:
           db: {get_input: ceilometer_dsn}
@@ -40,7 +41,8 @@ Resources:
           service-password: {get_input: neutron_password}
         admin-password: {get_input: admin_password}
         rabbit:
-          username: {get_input: rabbit_user_name}
+          host: {get_input: rabbit_host}
+          username: {get_input: rabbit_username}
           password: {get_input: rabbit_password}
         live-update:
           host: {get_input: live_update_host}
@@ -54,7 +56,7 @@ Resources:
           servers:
               - {server: {get_input: ntp_server}, fudge: "stratum 0"}
   NovaComputePassthrough:
-    Type: OS::Heat::StructuredConfig
-    Properties:
+    type: OS::Heat::StructuredConfig
+    properties:
       group: os-apply-config
       config: {get_input: passthrough_config}