summaryrefslogtreecommitdiff
path: root/config/cloud.cfg
diff options
context:
space:
mode:
authorSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
committerSankar Tanguturi <stanguturi@stanguturi-rhel>2016-03-11 11:29:15 -0800
commita3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691 (patch)
tree74a6ebbe7c91c30467577eb231fab8c5f188b93c /config/cloud.cfg
parenta6e0922a4d34ede6df000dd8fc4bb3531218d69f (diff)
parent41470d29f5888baf7ec78e170cc0d6d981dcf63e (diff)
downloadvyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.tar.gz
vyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.zip
- Executed 'bzr merge' and resolved all the conflicts.
- Now my branch is identical to trunk.dist
Diffstat (limited to 'config/cloud.cfg')
-rw-r--r--config/cloud.cfg3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 74794ab0..a6afcc83 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -56,6 +56,7 @@ cloud_config_modules:
- fan
- landscape
- timezone
+ - lxd
- puppet
- chef
- salt-minion
@@ -88,7 +89,7 @@ system_info:
name: ubuntu
lock_passwd: True
gecos: Ubuntu
- groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video]
+ groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
shell: /bin/bash
# Other config here will be given to the distro class and/or path classes