Merge "Mv Ceilometer settings out of puppet/compute.yaml"

2 files changed, 6 insertions, 25 deletions

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]}
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 1398fedb..59b4cc2a 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -35,6 +35,10 @@ parameters:
     default: false
     description: Whether to store events in ceilometer.
     type: boolean
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
+    type: string
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -64,6 +68,7 @@ outputs:
     value:
       service_name: ceilometer_base
       config_settings:
+        ceilometer::debug: {get_param: Debug}
         ceilometer::db::database_connection:
           list_join:
             - ''
@@ -111,3 +116,4 @@ outputs:
         ceilometer::rabbit_heartbeat_timeout_threshold: 60
         ceilometer::db::database_db_max_retries: -1
         ceilometer::db::database_max_retries: -1
+        ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}