diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/config/cc_rightscale_userdata.py | 2 | ||||
| -rw-r--r-- | cloudinit/cs_utils.py | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -51,6 +51,7 @@ - cc_apt_configure: fix importing keys under python3 (LP: #1463373) - cc_growpart: fix specification of 'devices' list (LP: #1465436) - CloudStack: fix password setting on cloudstack > 4.5.1 (LP: #1464253) + - GCE: fix determination of availability zone (LP: #1470880) 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) 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) diff --git a/cloudinit/cs_utils.py b/cloudinit/cs_utils.py index dcf56431..83ac1a0e 100644 --- a/cloudinit/cs_utils.py +++ b/cloudinit/cs_utils.py @@ -83,8 +83,8 @@ class CepkoResult(object): connection = serial.Serial(port=SERIAL_PORT, timeout=READ_TIMEOUT, writeTimeout=WRITE_TIMEOUT) - connection.write(self.request) - return connection.readline().strip('\x04\n') + connection.write(self.request.encode('ascii')) + return connection.readline().strip(b'\x04\n').decode('ascii') def _marshal(self, raw_result): try: |