Do not hardcode default of [DEFAULT] http_timeout

Currently the ceilometer::http_timeout parameter defaults to 600 but
this equals to the default value defined in ceilometer itself.
This change removes that hardcode in puppet-ceilometer and just let
the service default used.

Change-Id: Idbd14e267b8759f7313a1a74db03f47e69a899aa

diff --git a/manifests/init.pp b/manifests/init.pp
index e46ade2dc4fefefbc2b5f6ef3e271867624c495a..e437813d5a80c319c84a0322c644caa16da1ef62 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,7 +7,7 @@
 #
 # [*http_timeout*]
 #   (Optional) Timeout seconds for HTTP requests.
-#   Defaults to 600.
+#   Defaults to $::os_service_default
 #
 # [*max_parallel_requests*]
 #   (Optional) Maximum number of parallel requests for services to handle at
@@ -268,7 +268,7 @@
 #   Defaults to undef.
 #
 class ceilometer(
-  $http_timeout                       = '600',
+  $http_timeout                       = $::os_service_default,
   $max_parallel_requests              = $::os_service_default,
   $telemetry_secret                   = false,
   $notification_topics                = ['notifications'],