ncm-openstack: add ceilometer hyp ipmi metrics

quattor · Jun 3, 2019 · 5cab54a · 5cab54a
1 parent 0aed917
commit 5cab54a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ncm-openstack/src/main/perl/OpenStack/Ceilometer.pm b/ncm-openstack/src/main/perl/OpenStack/Ceilometer.pm
@@ -33,7 +33,7 @@ Readonly::Hash my %DAEMON => {
 };
 
 Readonly::Hash my %DAEMON_HYPERVISOR => {
-    service => ['openstack-ceilometer-compute'],
+    service => ['openstack-ceilometer-compute', 'openstack-ceilometer-ipmi'],
 };
 
 

diff --git a/ncm-openstack/src/test/perl/hypervisor.t b/ncm-openstack/src/test/perl/hypervisor.t
@@ -55,7 +55,7 @@ ok(command_history_ok([
         'service openstack-nova-compute restart',
         'service neutron-linuxbridge-agent restart',
         'service openstack-ceilometer-compute restart',
-        #'service openstack-ceilometer-ipmi restart'
+        'service openstack-ceilometer-ipmi restart'
     ]), "expected hypervisor commands run");
 
 command_history_reset();

diff --git a/ncm-openstack/src/test/perl/hypervisor_ovs.t b/ncm-openstack/src/test/perl/hypervisor_ovs.t
@@ -55,7 +55,7 @@ ok(command_history_ok([
         'service openstack-nova-compute restart',
         'service neutron-openvswitch-agent restart',
         'service openstack-ceilometer-compute restart',
-        #'service openstack-ceilometer-ipmi restart',
+        'service openstack-ceilometer-ipmi restart',
     ]), "expected hypervisor ovs commands run");
 
 command_history_reset();
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ Readonly::Hash my %DAEMON => { @@
     };
     Readonly::Hash my %DAEMON_HYPERVISOR => {
-        service => ['openstack-ceilometer-compute'],
+        service => ['openstack-ceilometer-compute', 'openstack-ceilometer-ipmi'],
     };
@@ Expand Down @@