Add support to set host param

Lets expose this param so we can override the host param in
ceilometer config. Without this, some metrics from nova wont
make it as in some cases the fqdn might not match hostname.

Partial-bug: #1721054

Change-Id: I421a61dc31bd10fec0a10bf7e867001cf4dd3f02
(cherry picked from commit 4a249ae38c62d2670a37990c7cb44abd77ae3aa4)
(cherry picked from commit e89477fffd2b2a063b4f144dc13013bdbd118d26)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3c3b2f420fb1ba7d9701620eebb2fc5f10b5437f..ce1063830e4eb8aad41df3c3c3a7acc55cba8baa 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -206,6 +206,12 @@
 #   in the ceilometer config.
 #   Defaults to false.
 #
+# [*host*]
+#   (Optional) Name of this node. This is typically a hostname, FQDN, or
+#   IP address.
+#   Defaults to $::os_service_default.
+#
+#
 # === DEPRECATED PARAMETERS:
 #  [*metering_secret*]
 #   (optional)  Secret key for signing messages.
@@ -286,6 +292,7 @@ class ceilometer(
   $amqp_username                      = $::os_service_default,
   $amqp_password                      = $::os_service_default,
   $purge_config                       = false,
+  $host                               = $::os_service_default,
   # DEPRECATED PARAMETERS
   $alarm_history_time_to_live         = undef,
   $metering_secret                    = undef,
@@ -399,6 +406,7 @@ deprecated. Please use ceilometer::default_transport_url instead.")
   # Once we got here, we can act as an honey badger on the rpc used.
   ceilometer_config {
     'DEFAULT/http_timeout'                : value => $http_timeout;
+    'DEFAULT/host'                        : value => $host;
     'publisher/telemetry_secret'          : value => $telemetry_secret_real, secret => true;
     'database/event_time_to_live'         : value => $event_time_to_live;
     'database/metering_time_to_live'      : value => $metering_time_to_live;

diff --git a/releasenotes/notes/set-ceilometer-host-1e3d3f9de3642cd0.yaml b/releasenotes/notes/set-ceilometer-host-1e3d3f9de3642cd0.yaml
new file mode 100644 (file)
index 0000000..494dbc5
--- /dev/null
+++ b/releasenotes/notes/set-ceilometer-host-1e3d3f9de3642cd0.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Add support to override host param in ceilometer config. Without this
+    sometimes fqdn wont match and some nova metrics will be skipped.

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 2f28d6fea5f836b03b3ff3242b4c8f3f1b2c8e14..2acead42cc9451bf992d978ab60df58b7f25c68f 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -13,6 +13,7 @@ describe 'ceilometer' do
       :log_dir                    => '/var/log/ceilometer',
       :use_stderr                 => 'True',
       :purge_config               => false,
+      :host                       => 'foo.domain'
     }
   end
 
@@ -36,6 +37,10 @@ describe 'ceilometer' do
       is_expected.to contain_ceilometer_config('DEFAULT/http_timeout').with_value(params[:http_timeout])
     end
 
+    it 'configures host name' do
+      is_expected.to contain_ceilometer_config('DEFAULT/host').with_value(params[:host])
+    end
+
     context 'with rabbit_host parameter' do
       before { params.merge!( rabbit_params ) }
       it_configures 'a ceilometer base installation'