summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-03-08 12:15:29 -0500
committerScott Moser <smoser@ubuntu.com>2012-03-08 12:15:29 -0500
commita0a5d2af8109dfc0cd0685b2d7a54e261a3b289e (patch)
tree99e618767b05f5675cbf6a8630e91bf7c739afb5
parent996182c615548e56787551b294279158011b6bf2 (diff)
downloadvyos-cloud-init-a0a5d2af8109dfc0cd0685b2d7a54e261a3b289e.tar.gz
vyos-cloud-init-a0a5d2af8109dfc0cd0685b2d7a54e261a3b289e.zip
add MaaS datasource to default searched
-rw-r--r--cloudinit/__init__.py2
-rw-r--r--config/cloud.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index ccaa28c8..9f188766 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -29,7 +29,7 @@ cfg_env_name = "CLOUD_CFG"
cfg_builtin = """
log_cfgs: []
-datasource_list: ["NoCloud", "ConfigDrive", "OVF", "Ec2"]
+datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2" ]
def_log_file: /var/log/cloud-init.log
syslog_fix_perms: syslog:adm
"""
diff --git a/config/cloud.cfg b/config/cloud.cfg
index fe197ca8..01e63ef8 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -1,7 +1,7 @@
user: ubuntu
disable_root: 1
preserve_hostname: False
-# datasource_list: [ "NoCloud", "ConfigDrive", "OVF", "Ec2" ]
+# datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2" ]
cloud_init_modules:
- bootcmd