summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-07-10 17:45:38 -0400
committerScott Moser <smoser@ubuntu.com>2015-07-10 17:45:38 -0400
commit8711d6ab60f25ee8604fd777c749ef3f90c4bd7f (patch)
tree987c30e262a578725a77b02ea34525c8f968b8b1
parent7aa26486394f98dbc2bb3b61f9d49671e6d32af1 (diff)
parent7e9e07608f33f57b620b2dca78cf0e1d9da4d53f (diff)
downloadvyos-cloud-init-8711d6ab60f25ee8604fd777c749ef3f90c4bd7f.tar.gz
vyos-cloud-init-8711d6ab60f25ee8604fd777c749ef3f90c4bd7f.zip
Fix regressed logic causing rightscale userdata to no longer work.
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.
-rw-r--r--cloudinit/config/cc_rightscale_userdata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py
index 24880d13..0ecf3a4d 100644
--- a/cloudinit/config/cc_rightscale_userdata.py
+++ b/cloudinit/config/cc_rightscale_userdata.py
@@ -58,7 +58,7 @@ def handle(name, _cfg, cloud, log, _args):
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)