summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-09-09 16:00:55 -0400
committerScott Moser <smoser@brickies.net>2016-09-09 16:00:55 -0400
commit6baa2c684e83812149b367073352eb8d754c8591 (patch)
tree1cc74a65bf1500c8cf0e316c80eac77f464976d8 /config
parent314aac21a2f096917f4f92ed61bdf832ba446ae5 (diff)
parent34a26f7f59f2963691e36ca0476bec9fc9ccef63 (diff)
downloadvyos-cloud-init-6baa2c684e83812149b367073352eb8d754c8591.tar.gz
vyos-cloud-init-6baa2c684e83812149b367073352eb8d754c8591.zip
merge from master at 0.7.7-28-g34a26f7
Diffstat (limited to 'config')
-rw-r--r--config/cloud.cfg16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 2d7fb473..7c94ec5c 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -49,25 +49,25 @@ cloud_config_modules:
- ssh-import-id
- locale
- set-passwords
- - snappy
- grub-dpkg
- apt-pipelining
- apt-configure
+ - timezone
+ - disable-ec2-metadata
+ - runcmd
+ - byobu
+
+# The modules that run in the 'final' stage
+cloud_final_modules:
+ - snappy
- package-update-upgrade-install
- fan
- landscape
- - timezone
- lxd
- puppet
- chef
- salt-minion
- mcollective
- - disable-ec2-metadata
- - runcmd
- - byobu
-
-# The modules that run in the 'final' stage
-cloud_final_modules:
- rightscale_userdata
- scripts-vendor
- scripts-per-once