diff options
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 5 | ||||
| -rw-r--r-- | doc/sources/smartos/README.rst | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index 1cf9e4f0..45f03a7e 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -62,9 +62,12 @@ class DataSourceSmartOS(sources.DataSource): self.is_smartdc = None self.base_64_encoded = [] self.seed = self.sys_cfg.get("serial_device", DEF_TTY_LOC) - self.all_base64 = self.sys_cfg.get("decode_base64", False) self.seed_timeout = self.sys_cfg.get("serial_timeout", DEF_TTY_TIMEOUT) + self.all_base64 = False + if 'decode_base64' in self.ds_cfg: + self.all_base64 = self.ds_cfg['decode_base64'] + self.smartos_no_base64 = SMARTOS_NO_BASE64 if 'no_base64_decode' in self.ds_cfg: self.smartos_no_base64 = self.ds_cfg['no_base64_decode'] diff --git a/doc/sources/smartos/README.rst b/doc/sources/smartos/README.rst index ba90e7af..8f72fa0f 100644 --- a/doc/sources/smartos/README.rst +++ b/doc/sources/smartos/README.rst @@ -35,7 +35,7 @@ user-script SmartOS traditionally supports sending over a user-script for execution at the rc.local level. Cloud-init supports running user-scripts as if they were -cloud-init user-data. In this sense, anything with a shell interpetter +cloud-init user-data. In this sense, anything with a shell interpreter directive will run user-data and user-script @@ -47,7 +47,7 @@ always supercede any user-script data. This is for consistency. base64 ------ -The following are excempt from base64 encoding, owing to the fact that they +The following are exempt from base64 encoding, owing to the fact that they are provided by SmartOS: * root_authorized_keys * enable_motd_sys_info @@ -63,4 +63,4 @@ or not to base64 decode something: * base_64_encoded: A comma deliminated list of which values are base64 encoded. * no_base64_decode: This is a configuration setting (i.e. /etc/cloud/cloud.cfg.d) - that sets which values should not be base64 decoded. + that sets which values should not be base64 decoded. |