← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~rjschwei/cloud-init/rightscaleLogicFix into lp:cloud-init

 

Robert Schweikert has proposed merging lp:~rjschwei/cloud-init/rightscaleLogicFix into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~rjschwei/cloud-init/rightscaleLogicFix/+merge/263252

Change the logic for user data handling back to the original intent. A style change also modified the logic of the user data handling leading to user data being ignored even if it exists.
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~rjschwei/cloud-init/rightscaleLogicFix into lp:cloud-init.
=== modified file 'cloudinit/config/cc_rightscale_userdata.py'
--- cloudinit/config/cc_rightscale_userdata.py	2015-02-10 17:25:01 +0000
+++ cloudinit/config/cc_rightscale_userdata.py	2015-06-29 15:18:44 +0000
@@ -58,7 +58,7 @@
 
     try:
         mdict = parse_qs(ud)
-        if mdict or MY_HOOKNAME not in mdict:
+        if not mdict or MY_HOOKNAME not in mdict:
             log.debug(("Skipping module %s, "
                        "did not find %s in parsed"
                        " raw userdata"), name, MY_HOOKNAME)


Follow ups