From 0ec58cf5368c722c87cc6b5dcba5fefd77e3e444 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 11 Aug 2016 09:15:40 -0400 Subject: Mv Ceilometer settings out of puppet/compute.yaml This finishes moving most of the config settings out of compute.yaml for Ceilometer. Change-Id: I96369ebba28f0af4eb2d6d520b478213d8021822 Related-Bug: #1604412 --- puppet/compute.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'puppet/compute.yaml') diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 6632c8d4..a41b6075 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -8,20 +8,6 @@ parameters: description: The password for the keystone admin account, used for monitoring, querying neutron etc. type: string hidden: true - CeilometerComputeAgent: - description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly - type: string - default: '' - constraints: - - allowed_values: ['', Present] - CeilometerMeteringSecret: - description: Secret shared by the ceilometer services. - type: string - hidden: true - CeilometerPassword: - description: The password for the ceilometer service account. - type: string - hidden: true Debug: default: '' description: Set to True to enable debugging on all services. @@ -350,14 +336,6 @@ resources: nova_api_host: {get_input: nova_api_host} nova::compute::vncproxy_host: {get_input: nova_public_ip} nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address} - ceilometer::debug: {get_input: debug} - ceilometer::rabbit_userid: {get_input: rabbit_username} - ceilometer::rabbit_password: {get_input: rabbit_password} - ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} - ceilometer::rabbit_port: {get_input: rabbit_client_port} - ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret} - ceilometer::agent::auth::auth_password: {get_input: ceilometer_password} - ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url} neutron::debug: {get_input: debug} neutron::rabbit_password: {get_input: rabbit_password} neutron::rabbit_user: {get_input: rabbit_username} @@ -382,9 +360,6 @@ resources: nova_public_ip: {get_param: NovaPublicIP} nova_api_host: {get_param: NovaApiHost} nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]} - ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} - ceilometer_password: {get_param: CeilometerPassword} - ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]} neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]} -- cgit 1.2.3-korg