diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-02-17 15:48:41 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-02-17 15:48:41 -0500 |
| commit | 6fe51bb797810832de4301f85b5b3ca11630e108 (patch) | |
| tree | 95b494d8bf677a813f0d53365b02ae46fca22035 /config | |
| parent | e285b1614b00c5689ac71ec9afcfa83d996b22c0 (diff) | |
| download | vyos-cloud-init-6fe51bb797810832de4301f85b5b3ca11630e108.tar.gz vyos-cloud-init-6fe51bb797810832de4301f85b5b3ca11630e108.zip | |
change from yaml+'#include' to yaml + config.d format for cloud.cfg
Diffstat (limited to 'config')
| -rw-r--r-- | config/cloud.cfg | 9 | ||||
| -rw-r--r-- | config/cloud.cfg.d/05_logging.cfg (renamed from config/logging.cfg) | 0 | ||||
| -rw-r--r-- | config/cloud.cfg.d/README | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg index c27cc5e8..d9f352e8 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -32,12 +32,3 @@ cloud_final_modules: - keys-to-console - phone-home - final-message - -## logging.cfg contains info on logging output for cloud-init -#include logging.cfg - -## distro.cfg contains the local distro specific values -#opt_include distro.cfg - -##local.cfg is for local overrides of any of the above -#opt_include local.cfg diff --git a/config/logging.cfg b/config/cloud.cfg.d/05_logging.cfg index 2e7ac2ed..2e7ac2ed 100644 --- a/config/logging.cfg +++ b/config/cloud.cfg.d/05_logging.cfg diff --git a/config/cloud.cfg.d/README b/config/cloud.cfg.d/README new file mode 100644 index 00000000..60702e9d --- /dev/null +++ b/config/cloud.cfg.d/README @@ -0,0 +1,3 @@ +# All files in this directory will be read by cloud-init +# They are read in lexical order. Later files overwrite values in +# earlier files. |