diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_rightscale_userdata.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_rightscale_userdata.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_rightscale_userdata.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_rightscale_userdata.py b/cloudinit/CloudConfig/cc_rightscale_userdata.py index 4875acbe..2b43023c 100644 --- a/cloudinit/CloudConfig/cc_rightscale_userdata.py +++ b/cloudinit/CloudConfig/cc_rightscale_userdata.py @@ -32,8 +32,9 @@ ## Therefore, this must run before that. ## ## + import cloudinit.util as util -from cloudinit.CloudConfig import per_once, per_always, per_instance +from cloudinit.CloudConfig import per_instance from cloudinit import get_ipath_cur from urlparse import parse_qs @@ -41,7 +42,7 @@ frequency = per_instance my_name = "cc_rightscale_userdata" my_hookname = 'CLOUD_INIT_REMOTE_HOOK' -def handle(name,cfg,cloud,log,args): +def handle(_name,_cfg,cloud,log,_args): try: ud = cloud.get_userdata_raw() except: @@ -49,7 +50,7 @@ def handle(name,cfg,cloud,log,args): return try: - mdict = parse_qs(cloud.get_userdata_raw()) + mdict = parse_qs(ud) if not my_hookname in mdict: return except: log.warn("failed to urlparse.parse_qa(userdata_raw())") @@ -57,7 +58,6 @@ def handle(name,cfg,cloud,log,args): scripts_d = get_ipath_cur('scripts') i = 0 - errors = [ ] first_e = None for url in mdict[my_hookname]: fname = "%s/rightscale-%02i" % (scripts_d,i) |