ng [Sat, 28 Nov 2015 16:56:48 +0000 (16:56 +0000)]
Merge branch 'master' into 'master'
Remove 'require augeas' (#4396)
Because the puppet 'require' keyword actually instantiates a class,
having 'require augeas' in base.pp means that you cannot instantiate the
augeas class anywhere else in your manifests, for example with some
optional parameters to the class. If you do, you will get a duplicate
definition error.
The README already says that the augeas module is required. It seems
better that this is managed outside of the module, allowing for
class parameter flexibility.
shorewall::rules::libvirt::host: adjust to changes in shorewall::mangle.
That is, make the resource's title more unique by including the destination
interface in it, and accordingly pass the desired action via the new,
dedicated parameter.
Micah Anderson [Tue, 19 May 2015 16:54:53 +0000 (12:54 -0400)]
Remove 'require augeas' (#4396)
Because the puppet 'require' keyword actually instantiates a class,
having 'require augeas' in base.pp means that you cannot instantiate the
augeas class anywhere else in your manifests, for example with some
optional parameters to the class. If you do, you will get a duplicate
definition error.
The README already says that the augeas module is required. It seems
better that this is managed outside of the module, allowing for
class parameter flexibility.
Jerome Charaoui [Mon, 2 Mar 2015 15:37:58 +0000 (15:37 +0000)]
Merge branch 'bugfix/Fix_DHCP_for_libvirt' into 'master'
Fix dhcp for libvirt
This branch uses the mangle table support added by the feature/Add_support_for_mangle_table branch to fix the libvirt DHCP when broken by recent kernel. It fills the checksum of this kind of packets on the libvirt interface.
This patch shouldn't break older setup, and is implemented so that it can be disabled.
Jerome Charaoui [Mon, 2 Mar 2015 15:37:31 +0000 (15:37 +0000)]
Merge branch 'feature/Add_support_for_mangle_table' into 'master'
Add support for mangle table.
When using the kernel from Debian Wheezy-backports (3.16.0-0.bpo.4-amd64), we encoutered a bug where shorewall was breaking the libvirt DHCP if restarted after it.
It seems that one has to add a rule in the POSTROUTING chain of the mangle table to --checksum-fill the DHCP packets for them to be properly catch by the VMs DHCP clients.
So we had to add support of the mangle table to the shared puppet module to fix that.
This patch does just that, and is meant to be used by the other branch I'll propose after.
bertagaz [Thu, 15 Jan 2015 11:33:41 +0000 (12:33 +0100)]
Fix DHCP from $vmz.
On newer kernel (tested on 3.16), the libvirt and shorewall iptables
rules have conflicts that need to be fixed by enabling back
--checksum-fill on $vmz, otherwise the VMs can't get a DHCP lease.
This stuff is not ready for the shared repo, but we want to take benefit from me
having already merged immerda's stuff into my branch and solved the conflicts.
This stuff is not ready for the shared repo, but we want to take benefit from me
having already merged immerda's stuff into my branch and solved the conflicts.
Micah Anderson [Tue, 11 Dec 2012 23:42:15 +0000 (18:42 -0500)]
Because the puppet shorewall module uses concat::fragment assembly to put the
final results in /etc/shorewall/puppet, we have to make sure the shorewall.conf
is pointing to that directory to get those configurations. This commit fixes that.
Micah Anderson [Tue, 4 Dec 2012 20:20:13 +0000 (15:20 -0500)]
Stop shipping the default shorewall.conf file, instead we should let the
operatingsystem package install its default config (this lets us stop having to
keep this file updated), and instead tell people to configure their
shorewall.conf file using the augeas method.
It is possible still to distribute a shorewall.conf from a site-shorewall
directory, however if the file is distributed, then it is not possible to use
the augeas method.