X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=nova-compute-config.yaml;h=48cfcf8188c760fae7ed7c09ef8f0a338dd11c68;hb=656b8385efde3e686c1f969bd5b32af0b08181af;hp=c4264430097eee6e2bb8e184f5381e10153c100c;hpb=9413fb3098254fb8cbeb5d4951aba474b8755afb;p=apex-tripleo-heat-templates.git diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index c4264430..48cfcf81 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -1,17 +1,20 @@ -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} + 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} @@ -20,12 +23,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} 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,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 +61,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}