From 6fe51bb797810832de4301f85b5b3ca11630e108 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 17 Feb 2011 15:48:41 -0500
Subject: change from yaml+'#include' to yaml + config.d format for cloud.cfg

---
 config/cloud.cfg                  |  9 -------
 config/cloud.cfg.d/05_logging.cfg | 57 +++++++++++++++++++++++++++++++++++++++
 config/cloud.cfg.d/README         |  3 +++
 config/logging.cfg                | 57 ---------------------------------------
 4 files changed, 60 insertions(+), 66 deletions(-)
 create mode 100644 config/cloud.cfg.d/05_logging.cfg
 create mode 100644 config/cloud.cfg.d/README
 delete mode 100644 config/logging.cfg

(limited to 'config')

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/cloud.cfg.d/05_logging.cfg b/config/cloud.cfg.d/05_logging.cfg
new file mode 100644
index 00000000..2e7ac2ed
--- /dev/null
+++ b/config/cloud.cfg.d/05_logging.cfg
@@ -0,0 +1,57 @@
+## this yaml formated config file handles setting
+## logger information.  The values that are necessary to be set
+## are seen at the bottom.  The top '_log' are only used to remove
+## redundency in a syslog and fallback-to-file case.
+##
+## The 'log_cfgs' entry defines a list of logger configs
+## Each entry in the list is tried, and the first one that
+## works is used.  If a log_cfg list entry is an array, it will
+## be joined with '\n'.
+_log:
+ - &log_base |
+   [loggers]
+   keys=root,cloudinit
+   
+   [handlers]
+   keys=consoleHandler,cloudLogHandler
+   
+   [formatters]
+   keys=simpleFormatter,arg0Formatter
+   
+   [logger_root]
+   level=DEBUG
+   handlers=consoleHandler,cloudLogHandler
+   
+   [logger_cloudinit]
+   level=DEBUG
+   qualname=cloudinit
+   handlers=
+   propagate=1
+   
+   [handler_consoleHandler]
+   class=StreamHandler
+   level=WARNING
+   formatter=arg0Formatter
+   args=(sys.stderr,)
+   
+   [formatter_arg0Formatter]
+   format=%(asctime)s - %(filename)s[%(levelname)s]: %(message)s
+   
+   [formatter_simpleFormatter]
+   format=[CLOUDINIT] %(filename)s[%(levelname)s]: %(message)s
+ - &log_file |
+   [handler_cloudLogHandler]
+   class=FileHandler
+   level=DEBUG
+   formatter=arg0Formatter
+   args=('/var/log/cloud-init.log',)
+ - &log_syslog |
+   [handler_cloudLogHandler]
+   class=handlers.SysLogHandler
+   level=DEBUG
+   formatter=simpleFormatter
+   args=("/dev/log", handlers.SysLogHandler.LOG_USER)
+
+log_cfgs:
+ - [ *log_base, *log_syslog ]
+ - [ *log_base, *log_file ]
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.
diff --git a/config/logging.cfg b/config/logging.cfg
deleted file mode 100644
index 2e7ac2ed..00000000
--- a/config/logging.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-## this yaml formated config file handles setting
-## logger information.  The values that are necessary to be set
-## are seen at the bottom.  The top '_log' are only used to remove
-## redundency in a syslog and fallback-to-file case.
-##
-## The 'log_cfgs' entry defines a list of logger configs
-## Each entry in the list is tried, and the first one that
-## works is used.  If a log_cfg list entry is an array, it will
-## be joined with '\n'.
-_log:
- - &log_base |
-   [loggers]
-   keys=root,cloudinit
-   
-   [handlers]
-   keys=consoleHandler,cloudLogHandler
-   
-   [formatters]
-   keys=simpleFormatter,arg0Formatter
-   
-   [logger_root]
-   level=DEBUG
-   handlers=consoleHandler,cloudLogHandler
-   
-   [logger_cloudinit]
-   level=DEBUG
-   qualname=cloudinit
-   handlers=
-   propagate=1
-   
-   [handler_consoleHandler]
-   class=StreamHandler
-   level=WARNING
-   formatter=arg0Formatter
-   args=(sys.stderr,)
-   
-   [formatter_arg0Formatter]
-   format=%(asctime)s - %(filename)s[%(levelname)s]: %(message)s
-   
-   [formatter_simpleFormatter]
-   format=[CLOUDINIT] %(filename)s[%(levelname)s]: %(message)s
- - &log_file |
-   [handler_cloudLogHandler]
-   class=FileHandler
-   level=DEBUG
-   formatter=arg0Formatter
-   args=('/var/log/cloud-init.log',)
- - &log_syslog |
-   [handler_cloudLogHandler]
-   class=handlers.SysLogHandler
-   level=DEBUG
-   formatter=simpleFormatter
-   args=("/dev/log", handlers.SysLogHandler.LOG_USER)
-
-log_cfgs:
- - [ *log_base, *log_syslog ]
- - [ *log_base, *log_file ]
-- 
cgit v1.2.3