Change in vdsm[ovirt-3.5]: hook: fix macspoof hook

Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/32819

to review the following change.

Change subject: hook: fix macspoof hook
......................................................................

hook: fix macspoof hook

The hook should be build with default VDSM build.

Enabling mac-spoofing is required for the appliance specifically for
dhcp agent which is connected to the networks bridge by a port (one or
more dhcp agent per network). In order for packets not to be blocked by
ebtable rules (introduced by nwfilter), mac-spoof should be enabled.

Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Bug-Url: https://bugzilla.redhat.com/1139155
Signed-off-by: Petr Horáček <phoracek(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/32817
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm.spec.in
M vdsm_hooks/Makefile.am
2 files changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/32819/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index b69f0aa..001b4b9 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1247,6 +1247,12 @@
 %{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
 %{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py*
 
+%files hook-macspoof
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
+
 %if 0%{?with_vhostmd}
 %files hook-vhostmd
 %defattr(-, root, root, -)
@@ -1320,12 +1326,6 @@
 %files hook-macbind
 %defattr(-, root, root, -)
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macbind
-
-%files hook-macspoof
-%defattr(-, root, root, -)
-%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
-%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
-%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
 
 %files hook-extnet
 %defattr(-, root, root, -)
diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am
index 5e4d731..028d25a 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 = ethtool_options faqemu vhostmd qemucmdline openstacknet
+SUBDIRS = ethtool_options faqemu vhostmd qemucmdline openstacknet macspoof
 
 include $(top_srcdir)/build-aux/Makefile.subs
 
@@ -35,7 +35,6 @@
 	hugepages \
 	isolatedprivatevlan \
 	macbind \
-	macspoof \
 	nestedvt \
 	numa \
 	pincpu \


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: hook: fix macspoof hook
......................................................................


Patch Set 2:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms_merged/162/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: hook: fix macspoof hook
......................................................................


hook: fix macspoof hook

The hook should be build with default VDSM build.

Enabling mac-spoofing is required for the appliance specifically for
dhcp agent which is connected to the networks bridge by a port (one or
more dhcp agent per network). In order for packets not to be blocked by
ebtable rules (introduced by nwfilter), mac-spoof should be enabled.

Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Bug-Url: https://bugzilla.redhat.com/1139155
Signed-off-by: Petr Horáček <phoracek(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/32817
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/32819
Reviewed-by: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
---
M vdsm.spec.in
M vdsm_hooks/Makefile.am
2 files changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Antoni Segura Puimedon: Looks good to me, but someone else must approve
  Petr Horáček: Verified
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

Petr Horáček has posted comments on this change.

Change subject: hook: fix macspoof hook
......................................................................


Patch Set 1: Verified+1

`make rpm` passed ok

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: hook: fix macspoof hook
......................................................................


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Antoni Segura Puimedon has posted comments on this change.

Change subject: hook: fix macspoof hook
......................................................................


Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I924ba6e85f7299c72724c8b20a0e64d7b197ca23
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No