X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nova-compute-config.yaml;h=6eac493652fa3c182724ab5bfb6a535e583548ea;hb=3757966936867eadd708b5199893ad41937d1f1f;hp=4d672f66ec3713c88ad9715edf13eba8ea2745eb;hpb=46748fdffb57960be79971b6466cc739e052591a;p=apex-tripleo-heat-templates.git

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 4d672f66..6eac4936 100644
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -1,17 +1,19 @@
-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 }
           compute_libvirt_type: { get_input: nova_compute_libvirt_type }
           db: {get_input: nova_dsn}
+          debug: {get_param: Debug}
           host: {get_input: nova_api_host}
           service-password: {get_input: nova_password}
         ceilometer:
           db: {get_input: ceilometer_dsn}
+          debug: {get_param: Debug}
           metering_secret: {get_input: ceilometer_metering_secret}
           service-password: {get_input: ceilometer_password}
           compute_agent: {get_input: ceilometer_compute_agent}
@@ -20,11 +22,15 @@ Resources:
           readonly_user_name: {get_input: snmpd_readonly_user_name}
           readonly_user_password: {get_input: snmpd_readonly_user_password}
         glance:
+          debug: {get_param: Debug}
           host: {get_input: glance_host}
-        hosts: {get_input: static_hosts}
+          port: {get_input: glance_port}
+          protocol: {get_input: glance_protocol}
         keystone:
+          debug: {get_param: Debug}
           host: {get_input: keystone_host}
         neutron:
+          debug: {get_param: Debug}
           flat-networks: {get_input: neutron_flat_networks}
           host: {get_input: neutron_host}
           ovs_db: {get_input: neutron_dsn}
@@ -40,7 +46,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}
@@ -50,8 +56,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:
+    type: OS::Heat::StructuredConfig
+    properties:
       group: os-apply-config
       config: {get_input: passthrough_config}