Mike Kolesnik has uploaded a new change for review.

Change subject: hooks: Fix openstacknet hook
......................................................................

hooks: Fix openstacknet hook

The hook should be built with default VDSM build since we want to supply
it to users.

Additionally, the consts file should be packaged with it's "binaries" in
the RPM.

Change-Id: I6e9f1c6a6ffbc4fc0008fe2d897dac0d44a8c300
Signed-off-by: Mike Kolesnik <[email protected]>
---
M vdsm.spec.in
M vdsm_hooks/Makefile.am
2 files changed, 15 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/16556/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index a781bd4..ac71e0e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1028,6 +1028,20 @@
 %endif
 %{_datadir}/%{vdsm_name}/tests/functional/*.py*
 
+%files hook-openstacknet
+%defattr(-, root, root, -)
+%{_sysconfdir}/sudoers.d/50_vdsm_hook_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_consts.py*
+
 %files hook-vhostmd
 %defattr(-, root, root, -)
 %doc COPYING
@@ -1094,20 +1108,6 @@
 %files hook-numa
 %defattr(-, root, root, -)
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_numa
-
-%files hook-openstacknet
-%defattr(-, root, root, -)
-%{_sysconfdir}/sudoers.d/50_vdsm_hook_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_consts.py
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_consts.py
-%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_consts.py
-%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_consts.py
-%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_consts.py
 
 %files hook-pincpu
 %defattr(-, root, root, -)
diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am
index 6851364..8a8d594 100644
--- a/vdsm_hooks/Makefile.am
+++ b/vdsm_hooks/Makefile.am
@@ -18,7 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-SUBDIRS = faqemu vhostmd qemucmdline
+SUBDIRS = faqemu vhostmd qemucmdline openstacknet
 
 include $(top_srcdir)/build-aux/Makefile.subs
 
@@ -35,7 +35,6 @@
        macspoof \
        nestedvt \
        numa \
-       openstacknet \
        pincpu \
        promisc \
        qos \


-- 
To view, visit http://gerrit.ovirt.org/16556
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e9f1c6a6ffbc4fc0008fe2d897dac0d44a8c300
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to