diff options
author | Dan Prince <dprince@redhat.com> | 2014-10-15 11:18:42 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2014-11-14 11:56:22 -0500 |
commit | eaa52183af833d286d7e5c2f1b58be3df346d2de (patch) | |
tree | 34c7cf63cb03c996f5fe302b71e7e590ba898011 /compute.yaml | |
parent | 3043a28d07b6d45436406627c9ace185543529e6 (diff) |
Split out Nova software config
This is a step towards supporting pluggable software configurations
in the heat templates. By moving compute-config out of compute.yaml
we make it possible to define alternate implementations by
changing the OS::TripleO::Compute::SoftwareConfig value in the
overcloud-resource-registry.yaml heat environment file.
Co-Authored-By: Steve Hardy <shardy@redhat.com>
Change-Id: I250dc1a8c02626cf7d1a5d2ce92706504ec0c7de
Diffstat (limited to 'compute.yaml')
-rw-r--r-- | compute.yaml | 66 |
1 files changed, 4 insertions, 62 deletions
diff --git a/compute.yaml b/compute.yaml index bc13509c..57b30868 100644 --- a/compute.yaml +++ b/compute.yaml @@ -245,74 +245,16 @@ resources: user_data_format: SOFTWARE_CONFIG NovaComputeConfig: - 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} - 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} - 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: - debug: {get_param: Debug} - host: {get_input: glance_host} - 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} - ovs: - local_ip: {get_input: neutron_local_ip} - tenant_network_type: {get_input: neutron_tenant_network_type} - tunnel_types: {get_input: neutron_tunnel_types} - network_vlan_ranges: {get_input: neutron_network_vlan_ranges} - bridge_mappings: {get_input: neutron_bridge_mappings} - enable_tunneling: {get_input: neutron_enable_tunneling} - physical_bridge: {get_input: neutron_physical_bridge} - public_interface: {get_input: neutron_public_interface} - 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"} + type: OS::TripleO::Compute::SoftwareConfig NovaComputeDeployment: - type: OS::Heat::StructuredDeployment + type: OS::TripleO::SoftwareDeployment properties: signal_transport: NO_SIGNAL - config: {get_resource: NovaComputeConfig} + config: {get_attr: [NovaComputeConfig, config_id]} server: {get_resource: NovaCompute} input_values: + debug: {get_param: Debug} nova_compute_driver: {get_param: NovaComputeDriver} nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType} nova_dsn: {get_param: NovaDSN} |