BlockStore: Exec puppet after all configuration

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

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index a7708a2..1fe787e 100644 (file)
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -7,13 +7,11 @@ resources:
         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}
           public_ip: {get_input: nova_public_ip}
           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}
@@ -36,10 +34,10 @@ resources:
           host: {get_input: neutron_host}
           router_distributed: {get_input: neutron_router_distributed}
           agent_mode: {get_input: neutron_agent_mode}
-          ovs_db: {get_input: neutron_dsn}
           metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
           mechanism_drivers: {get_input: neutron_mechanism_drivers}
           allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
+          l3_ha: {get_input: neutron_l3_ha}
           ovs:
             local_ip: {get_input: neutron_local_ip}
             tenant_network_type: {get_input: neutron_tenant_network_type}
@@ -58,7 +56,7 @@ resources:
           password: {get_input: rabbit_password}
         ntp:
           servers:
-              - {server: {get_input: ntp_server}, fudge: "stratum 0"}
+              - {server: {get_input: ntp_server}}
   NovaComputePassthrough:
     type: OS::Heat::StructuredConfig
     properties: