[openstack] Add new controller and compute profiles.

Closes #578

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

11 files changed, 11 insertions, 11 deletions

diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index 9c8f4eda..f0ac2426 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -24,7 +24,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackCeilometer(Plugin):
     """Openstack Ceilometer"""
     plugin_name = "openstack_ceilometer"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller', 'openstack_compute')
 
     option_list = [("log", "gathers openstack-ceilometer logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index de58142a..af702476 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -25,7 +25,7 @@ class OpenStackCinder(Plugin):
     """OpenStack cinder
     """
     plugin_name = "openstack_cinder"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack cinder logs", "slow", True),
                    ("db", "gathers openstack cinder db version", "slow",
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index 33e69a99..a6e11f8e 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -23,7 +23,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackGlance(Plugin):
     """OpenStack Glance"""
     plugin_name = "openstack_glance"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack-glance logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index b60285a7..2886a736 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -21,7 +21,7 @@ class OpenStackHeat(Plugin):
     """OpenStack Heat
     """
     plugin_name = "openstack_heat"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack-heat logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index adb0871b..d514753a 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -25,7 +25,7 @@ class OpenStackHorizon(Plugin):
     """
 
     plugin_name = "openstack_horizon"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
     option_list = [("log", "gathers openstack horizon logs", "slow", True)]
 
     def setup(self):
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index 78689c3e..f40bdf44 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -21,7 +21,7 @@ class OpenStackKeystone(Plugin):
     """OpenStack Keystone
     """
     plugin_name = "openstack_keystone"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack keystone logs", "slow", True),
                    ("nopw", "dont gathers keystone passwords", "slow", True)]
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index fc494d26..8cddb4a0 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -31,7 +31,7 @@ class Neutron(Plugin):
     """OpenStack Networking
     """
     plugin_name = "openstack_neutron"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller', 'openstack_compute')
 
     option_list = [("log", "Gathers all Neutron logs", "slow", False),
                    ("quantum", "Overrides checks for newer Neutron components",
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index 3ea15715..43fceaa5 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -24,7 +24,7 @@ class OpenStackNova(Plugin):
     """OpenStack Nova
     """
     plugin_name = "openstack_nova"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller', 'openstack_compute')
 
     option_list = [("log", "gathers openstack nova logs", "slow", True),
                    ("cmds", "gathers openstack nova commands", "slow", False)]
diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py
index 2081d836..b084241b 100644
--- a/sos/plugins/openstack_sahara.py
+++ b/sos/plugins/openstack_sahara.py
@@ -20,7 +20,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackSahara(Plugin):
     """OpenStack Sahara"""
     plugin_name = 'openstack_sahara'
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack sahara logs", "slow", True)]
 
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index cd8baa7c..0f04533e 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -23,7 +23,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackSwift(Plugin):
     """OpenStack Swift"""
     plugin_name = "openstack_swift"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
 
     option_list = [("log", "gathers openstack-swift logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py
index 29b91790..edd69404 100644
--- a/sos/plugins/openstack_trove.py
+++ b/sos/plugins/openstack_trove.py
@@ -23,7 +23,7 @@ class OpenStackTrove(Plugin):
     """
 
     plugin_name = "openstack_trove"
-    profiles = ('openstack',)
+    profiles = ('openstack', 'openstack_controller')
     option_list = [("log", "gathers openstack trove logs", "slow", True)]
 
     def setup(self):