Fabian Deutsch has uploaded a new change for review. Change subject: Don't persist collectd.conf by default ......................................................................
Don't persist collectd.conf by default … only persist it when it's used. Change-Id: I66358fd7f65dbf27676bffa5a01ef3c273d449d0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=951024 Signed-off-by: Fabian Deutsch <[email protected]> --- M scripts/ovirt-functions.in M src/ovirt/node/config/defaults.py 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/46/25146/1 diff --git a/scripts/ovirt-functions.in b/scripts/ovirt-functions.in index 5dbc8f4..dfb7eb3 100644 --- a/scripts/ovirt-functions.in +++ b/scripts/ovirt-functions.in @@ -30,7 +30,6 @@ /etc/ssh/ssh_host*_key* \ /etc/default/ovirt \ /etc/sysconfig/network \ - /etc/collectd.conf \ /etc/libvirt/qemu/ \ /etc/ssh/sshd_config \ /etc/pki \ diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py index 124748f..571cd3d 100644 --- a/src/ovirt/node/config/defaults.py +++ b/src/ovirt/node/config/defaults.py @@ -981,8 +981,10 @@ def commit(self): # pylint: disable-msg=E0611 from ovirt_config_setup import collectd # @UnresolvedImport + from ovirtnode.ovirtfunctions import ovirt_store_config # pylint: enable-msg=E0611 if collectd.write_collectd_config(server, port): + ovirt_store_config("/etc/collectd.conf") self.logger.debug("Collectd was configured successfully") else: raise exceptions.TransactionError("Failed to configure " + -- To view, visit http://gerrit.ovirt.org/25146 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66358fd7f65dbf27676bffa5a01ef3c273d449d0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
