From b5c554f759ae5d3906442f59aa755a497a38a490 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Tue, 3 Oct 2017 09:31:34 -0400
Subject: [PATCH] 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)
(cherry picked from commit df2b2291431619e01a0d843653bc71197f21f903)
---
 manifests/init.pp                                         | 8 ++++++++
 .../notes/set-ceilometer-host-1e3d3f9de3642cd0.yaml       | 5 +++++
 spec/classes/ceilometer_init_spec.rb                      | 5 +++++
 3 files changed, 18 insertions(+)
 create mode 100644 releasenotes/notes/set-ceilometer-host-1e3d3f9de3642cd0.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index e0a8ff6..2989e26 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -221,6 +221,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.
@@ -282,6 +288,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,
@@ -381,6 +388,7 @@ class ceilometer(
   # 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
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 36af30d..a666ee1 100644
--- 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'
-- 
2.45.2