summaryrefslogtreecommitdiff
path: root/cloudinit/CloudConfig/cc_mcollective.py
diff options
context:
space:
mode:
authorMike Milner <mike.milner@canonical.com>2012-01-17 13:39:37 -0400
committerMike Milner <mike.milner@canonical.com>2012-01-17 13:39:37 -0400
commit69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch)
tree303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_mcollective.py
parentf52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff)
parent1d00c0936bfc63117493d89268da8c81611b3c40 (diff)
downloadvyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz
vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_mcollective.py')
-rw-r--r--cloudinit/CloudConfig/cc_mcollective.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_mcollective.py b/cloudinit/CloudConfig/cc_mcollective.py
index c7912aa4..38fe4a3c 100644
--- a/cloudinit/CloudConfig/cc_mcollective.py
+++ b/cloudinit/CloudConfig/cc_mcollective.py
@@ -16,11 +16,9 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
import os
-import pwd
-import socket
import subprocess
-import fileinput
import StringIO
import ConfigParser
import cloudinit.CloudConfig as cc
@@ -40,7 +38,7 @@ class FakeSecHead(object):
finally: self.sechead = None
else: return self.fp.readline()
-def handle(name,cfg,cloud,log,args):
+def handle(_name,cfg,_cloud,_log,_args):
# If there isn't a mcollective key in the configuration don't do anything
if not cfg.has_key('mcollective'): return
mcollective_cfg = cfg['mcollective']