diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_rsyslog.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_rsyslog.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_rsyslog.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cloudinit/CloudConfig/cc_rsyslog.py b/cloudinit/CloudConfig/cc_rsyslog.py index a8ee8476..ab85a6d8 100644 --- a/cloudinit/CloudConfig/cc_rsyslog.py +++ b/cloudinit/CloudConfig/cc_rsyslog.py @@ -15,16 +15,16 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + import cloudinit import logging import cloudinit.util as util -import subprocess import traceback DEF_FILENAME = "20-cloud-config.conf" DEF_DIR = "/etc/rsyslog.d" -def handle(name,cfg,cloud,log,args): +def handle(_name,cfg,_cloud,log,_args): # rsyslog: # - "*.* @@192.158.1.1" # - content: "*.* @@192.0.2.1:10514" @@ -38,8 +38,6 @@ def handle(name,cfg,cloud,log,args): def_dir = cfg.get('rsyslog_dir', DEF_DIR) def_fname = cfg.get('rsyslog_filename', DEF_FILENAME) - entries = cfg['rsyslog'] - files = [ ] elst = [ ] for ent in cfg['rsyslog']: @@ -80,7 +78,7 @@ def handle(name,cfg,cloud,log,args): # it will also return failure on the attempt, so 'restarted' # won't get set log.debug("restarting rsyslog") - p = util.subp(['service', 'rsyslog', 'restart']) + util.subp(['service', 'rsyslog', 'restart']) restarted = True except Exception as e: |