Merge "Add numa-topology colector to the list of default collectors"

instack_undercloud/tests/test_undercloud.py

@@ -398,7 +398,7 @@ class TestGenerateEnvironment(BaseTestCase):
         env = undercloud._generate_environment('.')
         # Just spot check, we don't want to replicate the entire opt list here
         self.assertEqual(env['INSPECTION_COLLECTORS'],
-                         'default,extra-hardware,logs')
+                         'default,extra-hardware,numa-topology,logs')
         self.assertEqual('192.168.24.1/24', env['PUBLIC_INTERFACE_IP'])
         self.assertEqual('192.168.24.1', env['LOCAL_IP'])
         # The list is generated from a set, so we can't rely on ordering.

instack_undercloud/undercloud.py

@@ -1115,7 +1115,8 @@ def _generate_environment(instack_root):
         raise RuntimeError('inspection_extras must be enabled for '
                            'inspection_runbench to work')
     if CONF.inspection_extras:
-        instack_env['INSPECTION_COLLECTORS'] = 'default,extra-hardware,logs'
+        instack_env['INSPECTION_COLLECTORS'] = ('default,extra-hardware,'
+                                                'numa-topology,logs')
     else:
         instack_env['INSPECTION_COLLECTORS'] = 'default,logs'
 

releasenotes/notes/numa-topology-collector-8b000ce29863eecf.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Add 'numa-topology' collector to 'ipa-inspection-collectors' if
+    'inspection_extras' is true. The 'numa-topology' collector will fetch the
+    details about memory, cpu, nics associated with each NUMA node during
+    introspection. These details will be necessary in deriving the deployment
+    parameters for NFV usecases.