summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-09-29 14:03:23 -0400
committerScott Moser <smoser@brickies.net>2016-09-29 14:03:23 -0400
commit613d4117d71ae5b5c2424acb66a18096b8abc12a (patch)
tree72dfa2c0d2eb71c58f80b402f0ae8784b37dc55e /config
parentdde8fb70c8a05294b2ff06df18988c78203daa3b (diff)
parent02f6c4bb8cef17b3fe04ef4dc1ef199e20aeb4d9 (diff)
downloadvyos-cloud-init-613d4117d71ae5b5c2424acb66a18096b8abc12a.tar.gz
vyos-cloud-init-613d4117d71ae5b5c2424acb66a18096b8abc12a.zip
merge from master at 0.7.8-11-g02f6c4b
Diffstat (limited to 'config')
-rw-r--r--config/cloud.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 3b4c5383..d608dc86 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -45,13 +45,13 @@ cloud_config_modules:
# Emit the cloud config ready event
# this can be used by upstart jobs for 'start on cloud-config'.
- emit_upstart
- - ntp
- ssh-import-id
- locale
- set-passwords
- grub-dpkg
- apt-pipelining
- apt-configure
+ - ntp
- timezone
- disable-ec2-metadata
- runcmd