Puppet: overcloud compute config

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

diff --git a/compute-config.yaml b/compute-config.yaml
index 4d1e3ce..8cc7310 100644 (file)
--- a/compute-config.yaml
+++ b/compute-config.yaml
@@ -3,6 +3,13 @@ heat_template_version: 2014-10-16
 description: >
   Software Config for Nova Compute.
 
+parameters:
+  # unused here but is a placeholder for other compute-config templates
+  # which may choose to create in-templates resources that require server
+  server_id:
+    type: string
+    hidden: true
+
 resources:
   NovaComputeConfigImpl:
     type: OS::Heat::StructuredConfig
@@ -12,7 +19,6 @@ 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_input: debug}
           host: {get_input: nova_api_host}
           public_ip: {get_input: nova_public_ip}
@@ -39,7 +45,12 @@ resources:
           debug: {get_input: debug}
           flat-networks: {get_input: neutron_flat_networks}
           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}
           ovs:
             local_ip: {get_input: neutron_local_ip}
             tenant_network_type: {get_input: neutron_tenant_network_type}
@@ -49,19 +60,13 @@ resources:
             enable_tunneling: {get_input: neutron_enable_tunneling}
             physical_bridge: {get_input: neutron_physical_bridge}
             public_interface: {get_input: neutron_public_interface}
+            public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
           service-password: {get_input: neutron_password}
         admin-password: {get_input: admin_password}
         rabbit:
           host: {get_input: rabbit_host}
           username: {get_input: rabbit_username}
           password: {get_input: rabbit_password}
-        live-update:
-          host: {get_input: live_update_host}
-          username: {get_input: live_update_username}
-          password: {get_input: live_update_password}
-          tenant-name: {get_input: live_update_tenant_name}
-          base_image_id: {get_input: nova_image}
-          live_update_image_id: {get_input: live_update_compute_image}
         ntp:
           servers:
               - {server: {get_input: ntp_server}, fudge: "stratum 0"}