|
 |
0cd6dc |
From 7739c76eaa8b02ba41f23aaceac0b064619321ed Mon Sep 17 00:00:00 2001
|
|
|
0cd6dc |
From: Chris Johnston <chrisjohnston@ubuntu.com>
|
|
|
0cd6dc |
Date: Tue, 28 Oct 2014 10:37:08 -0400
|
|
|
0cd6dc |
Subject: [PATCH 17/93] [maas] Fix maas dumpdata command not found Fixes: #423
|
|
|
0cd6dc |
|
|
|
0cd6dc |
The maas dumpdata command issued by the MAAS plugin causes a command
|
|
|
0cd6dc |
not found error. The command is now issued to maas-region-admin.
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Also corrected capitalizations around the MAAS name.
|
|
|
0cd6dc |
Fixes: 423
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Signed-off-by: Chris Johnston <chrisjohnston@ubuntu.com>
|
|
|
0cd6dc |
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
|
0cd6dc |
---
|
|
|
0cd6dc |
sos/plugins/maas.py | 10 +++++++---
|
|
|
0cd6dc |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
0cd6dc |
|
|
|
0cd6dc |
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
|
|
|
0cd6dc |
index edcea5e..051f411 100644
|
|
|
0cd6dc |
--- a/sos/plugins/maas.py
|
|
|
0cd6dc |
+++ b/sos/plugins/maas.py
|
|
|
0cd6dc |
@@ -18,7 +18,7 @@ from sos.plugins import Plugin, UbuntuPlugin
|
|
|
0cd6dc |
|
|
|
0cd6dc |
|
|
|
0cd6dc |
class Maas(Plugin, UbuntuPlugin):
|
|
|
0cd6dc |
- """Ubuntu Metal-as-a-Service
|
|
|
0cd6dc |
+ """Ubuntu Metal-As-A-Service
|
|
|
0cd6dc |
"""
|
|
|
0cd6dc |
|
|
|
0cd6dc |
plugin_name = 'maas'
|
|
|
0cd6dc |
@@ -56,15 +56,19 @@ class Maas(Plugin, UbuntuPlugin):
|
|
|
0cd6dc |
self.add_cmd_output([
|
|
|
0cd6dc |
"apt-cache policy maas-*",
|
|
|
0cd6dc |
"apt-cache policy python-django-*",
|
|
|
0cd6dc |
- "maas dumpdata"
|
|
|
0cd6dc |
])
|
|
|
0cd6dc |
|
|
|
0cd6dc |
+ if self.is_installed("maas-region-controller"):
|
|
|
0cd6dc |
+ self.add_cmd_output([
|
|
|
0cd6dc |
+ "maas-region-admin dumpdata",
|
|
|
0cd6dc |
+ ])
|
|
|
0cd6dc |
+
|
|
|
0cd6dc |
if self._has_login_options():
|
|
|
0cd6dc |
if self._remote_api_login():
|
|
|
0cd6dc |
self.add_cmd_output("maas %s commissioning-results list" %
|
|
|
0cd6dc |
self.get_option("profile-name"))
|
|
|
0cd6dc |
else:
|
|
|
0cd6dc |
self._log_error(
|
|
|
0cd6dc |
- "Cannot login into Maas remote API with provided creds.")
|
|
|
0cd6dc |
+ "Cannot login into MAAS remote API with provided creds.")
|
|
|
0cd6dc |
|
|
|
0cd6dc |
# vim: et ts=4 sw=4
|
|
|
0cd6dc |
--
|
|
|
0cd6dc |
1.9.3
|
|
|
0cd6dc |
|