summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorCosmin Luță <cosmin.luta@avira.com>2012-03-04 16:36:23 +0200
committerCosmin Luță <cosmin.luta@avira.com>2012-03-04 16:36:23 +0200
commit131ca40e5e4770ef8536098863599a0cac157a3f (patch)
tree6a2b0e21d8e6df80ad156d84aed29117d1477bb0 /config
parent15648e327ad19c8332ab770698643c0e0335bc28 (diff)
parent1676825c229e3939ec5b06c494bdcb56d39dddb1 (diff)
downloadvyos-cloud-init-131ca40e5e4770ef8536098863599a0cac157a3f.tar.gz
vyos-cloud-init-131ca40e5e4770ef8536098863599a0cac157a3f.zip
Merge from main branch
Diffstat (limited to 'config')
-rw-r--r--config/cloud.cfg3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 81085d68..972e75da 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -1,7 +1,7 @@
user: ubuntu
disable_root: 1
preserve_hostname: False
-# datasource_list: [ "NoCloud", "OVF", "Ec2", "CS" ]
+# datasource_list: [ "NoCloud", "ConfigDrive", "OVF", "Ec2", "CS" ]
cloud_init_modules:
- bootcmd
@@ -24,6 +24,7 @@ cloud_config_modules:
- timezone
- puppet
- chef
+ - salt-minion
- mcollective
- disable-ec2-metadata
- runcmd