Ondřej Svoboda has uploaded a new change for review. Change subject: NetworkManager: configure to monitor ifcfg files ......................................................................
NetworkManager: configure to monitor ifcfg files The new configuration file instructs NetworkManager to automatically reload network configuration from directories its plugins manage: /etc/sysconfig/network-scripts/ in the case of ifcfg systems (Fedora, RHEL, CentOS and derivatives; ifcfg-rh plugin) /etc/NetworkManager/system-connections/ (keyfile plugin) and other directories (e.g. specific to Debian or Suse) This functionality is required to properly let NetworkManager know when VDSM consumes any of its devices (on ifcfg systems, by writing NM_CONTROLLED=no to an ifcfg file). TODO: NetworkManager must be restarted after installing the new configuration file. Change-Id: I3eb80b3a280abd72c7084860467aca12907d0477 Bug-Url: https://bugzilla.redhat.com/1304509 Signed-off-by: Ondřej Svoboda <[email protected]> --- M vdsm.spec.in A vdsm/90-vdsm-monitor-connection-files.conf M vdsm/Makefile.am 3 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/56365/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 3b761b8..fc343c9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -870,6 +870,8 @@ %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt %dir %{_libexecdir}/%{vdsm_name} +%dir %{_sysconfdir}/NetworkManager +%dir %{_sysconfdir}/NetworkManager/conf.d %dir %{_sysconfdir}/%{vdsm_name} %dir %{_sysconfdir}/%{vdsm_name}/mom.d %dir %{_datadir}/%{vdsm_name} @@ -907,6 +909,7 @@ %{_datadir}/%{vdsm_name}/virt/vmdevices/network.py* %{_datadir}/%{vdsm_name}/virt/vmdevices/storage.py* +%config(noreplace) %{_sysconfdir}/NetworkManager/conf.d/90-vdsm-monitor-connection-files.conf %config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf %config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf diff --git a/vdsm/90-vdsm-monitor-connection-files.conf b/vdsm/90-vdsm-monitor-connection-files.conf new file mode 100644 index 0000000..03d77dd --- /dev/null +++ b/vdsm/90-vdsm-monitor-connection-files.conf @@ -0,0 +1,5 @@ +# This file is necessary to let VDSM properly consume connections owned by +# NetworkManager (to make it unmanage them), primarily on ifcfg systems. + +[main] +monitor-connection-files=true diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 13c75a7..f72b97f 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -75,6 +75,7 @@ $(nodist_man8_MANS) EXTRA_DIST = \ + 90-vdsm-monitor-connection-files.conf \ bonding-defaults.json \ bonding-name2numeric.json \ dumpStorageTable.py.in \ @@ -121,6 +122,7 @@ install-data-logger \ install-data-logrotate \ install-data-mom \ + install-data-networkmanager \ install-data-rwtab \ install-data-sudoers \ install-data-sysctl @@ -148,6 +150,7 @@ uninstall-data-logger \ uninstall-data-logrotate \ uninstall-data-mom \ + uninstall-data-networkmanager \ uninstall-data-rwtab \ uninstall-data-sudoers \ uninstall-data-sysctl @@ -212,6 +215,15 @@ $(RM) $(DESTDIR)$(vdsmconfdir)/mom.d/*.policy $(RM) $(DESTDIR)$(vdsmconfdir)/mom.conf +install-data-networkmanager: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d + $(INSTALL_DATA) 90-vdsm-monitor-connection-files.conf \ + $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d + +uninstall-data-networkmanager: + $(RM) $(DESTDIR)$(sysconfdir)/NetworkManager/conf.d/\ + 90-vdsm-monitor-connection-files.conf + install-data-sudoers: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sudoers.d $(INSTALL_DATA) sudoers.vdsm \ -- To view, visit https://gerrit.ovirt.org/56365 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3eb80b3a280abd72c7084860467aca12907d0477 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
