diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-03-04 14:35:09 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-03-04 14:35:09 -0500 |
| commit | a9c7562ff3be9c552d757f24cfa61ef8985fe2e2 (patch) | |
| tree | ecdcf5232c9b5d2d0d0145cf1ce5ea3d7170d567 /cloudinit | |
| parent | d7b79b1c5703a9fc4d533d15efa5fdb1f4f8352b (diff) | |
| parent | 5c95d6817a4aea17054addceef5d955c75390aa1 (diff) | |
| download | vyos-cloud-init-a9c7562ff3be9c552d757f24cfa61ef8985fe2e2.tar.gz vyos-cloud-init-a9c7562ff3be9c552d757f24cfa61ef8985fe2e2.zip | |
merge from trunk
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/DataSourceCloudSigma.py | 5 | ||||
| -rw-r--r-- | cloudinit/util.py | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py index dad37119..e1c7e566 100644 --- a/cloudinit/sources/DataSourceCloudSigma.py +++ b/cloudinit/sources/DataSourceCloudSigma.py @@ -15,6 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from base64 import b64decode import re from cloudinit import log as logging @@ -61,7 +62,11 @@ class DataSourceCloudSigma(sources.DataSource): if dsmode == "disabled" or dsmode != self.dsmode: return False + base64_fields = server_meta.get('base64_fields', '').split(',') self.userdata_raw = server_meta.get('cloudinit-user-data', "") + if 'cloudinit-user-data' in base64_fields: + self.userdata_raw = b64decode(self.userdata_raw) + self.metadata = server_context self.ssh_public_key = server_meta['ssh_public_key'] diff --git a/cloudinit/util.py b/cloudinit/util.py index 87b0c853..06039ee2 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1395,8 +1395,10 @@ def get_builtin_cfg(): return obj_copy.deepcopy(CFG_BUILTIN) -def sym_link(source, link): +def sym_link(source, link, force=False): LOG.debug("Creating symbolic link from %r => %r", link, source) + if force and os.path.exists(link): + del_file(link) os.symlink(source, link) |