(#10164) fix ICMP property munging so that 'any' works #52

Closed
wants to merge 8 commits into
from

Conversation

Projects
None yet
4 participants
Contributor

grooverdan commented Dec 30, 2011

Preserve 'any' as a valid type for ICMP rather than converting to a
numberic 255. The iptables rules will return 'any' so keeping it
consistent prevents puppet from thinking its out of sync.

mrwacky42 and others added some commits Nov 12, 2011

@mrwacky42 mrwacky42 (#10984) Initial creation of class firewall
* Add Exec[firewall-persist] to save rules.  This allows the host to
  have iptables rules on reboot, before puppet runs.
* Debian hates you.  Add iptables init scripts for loading iptables at
  boot on releases of Debian that do not have them already.
* Add brains to the iptables/ip6tables providers to ensure kernel modules
  are loaded.
a60634b
@saysjonathan saysjonathan Merge pull request #34 from mediatemple/class-firewall
Initial creation of class firewall for issue #10984
bfbf01b
Member

saysjonathan commented Jan 13, 2012

Can you add fixtures to this change and rebase it into a single commit into a topic branch? Unrelated: your iptables-chain stuff is looking good.

@kbarber kbarber Revert "Merge pull request #34 from mediatemple/class-firewall"
This reverts commit bfbf01b, reversing
changes made to 0b55830.

This patch breaks the build, and wasn't ready for merge. The rspec test
scaffolding wasn't prepared and hasn't been tested with this module properly.
aae0998
Contributor

grooverdan commented Jan 14, 2012

commits rebased on branch correctly now. Sorry for the mess. Looks like i've got some other pull requests to fix. Thanks for iptables-chains feedback.

Member

kbarber commented Jan 22, 2012

@grooverdan this hasn't been rebased correctly. Do you want to try again? Something like:

git rebase -i master

(and only include your commits when vim opens up)

Arnoud Vermeer and others added some commits Jan 3, 2012

@kbarber Arnoud Vermeer (#11673) Adding OSPF(v3) protocol to puppetlabs-firewall
Added support for ospf to the proto property.
28df9f1
@kbarber kbarber Merge branch 'ticket/master/11673_ospf'
* ticket/master/11673_ospf:
  (#11673) Adding OSPF(v3) protocol to puppetlabs-firewall
864fa2d
Contributor

grooverdan commented Jan 22, 2012

I actually needed to 'git rebase -i 2543bda'.

Member

kbarber commented Jan 23, 2012

@grooverdan are you sure? This is still not merge-able in its current state ... as per the grey bar I'm seeing here :-).

Daniel Black and others added some commits Jan 23, 2012

@kbarber Daniel Black (#10165) Display multi-value: port, sport, dport and state command se…
…perated

Previously the output that changed was munged when puppet was being ran, this
change provides a comma seperated output when the values change instead.
f49754d
@kbarber kbarber Merge branch 'ticket/10165-port-commasep'
* ticket/10165-port-commasep:
  (#10165) Display multi-value: port, sport, dport and state command seperated
31b45bf
Daniel Black (#10164) fix ICMP property munging so that 'any' works
Preserve 'any' as a valid type for ICMP rather than converting to a
numberic 255. The iptables rules will return 'any' so keeping it
consistent prevents puppet from thinking its out of sync.
a0f25db
Contributor

grooverdan commented Jan 23, 2012

no i'm not sure. I fudged it again so that its blue (didn't know about the colours) but really have no idea how github tests its merge state. I've done a git diff to the upstream branch and it hows this single commit. I did a git branch from upstream and merged this in so I hope this is right even though it looks like 8 commits as opposed to one.

Member

kbarber commented Jan 24, 2012

@grooverdan No - its definitely not right. It should be showing 1 commit. I think the original problem is with the rebase like I said, but now I think its because you've specified to merge this into a particular commit (see the top of the pull request) - it should be puppetlabs:master. We're going to have to re-open this request I think, as you can't change that once its specified in github.

If its easier, just take a patch diff, and re-apply it on a clean branch. Once your done re-open the merge request. Sorry about the hassle.

kbarber closed this Jan 24, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment