Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Ensure we have the right modules loaded for weave-npc #2819

Merged
merged 2 commits into from
Feb 27, 2017
Merged

Conversation

bboreham
Copy link
Contributor

@bboreham bboreham commented Feb 27, 2017

Fixes #2726

At least when weave-npc is executed via the weave-kube daemonset. It would be nicer to separate those two concerns, but we already need to know that weave-npc is in use when creating the bridge.

@bboreham bboreham added this to the 1.9.1 milestone Feb 27, 2017
@bboreham
Copy link
Contributor Author

I have tested this by hand, by modifying the Docker daemon parameters to include --iptables=false and starting up weave-kube.

@brb brb self-requested a review February 27, 2017 14:08
@brb brb changed the base branch from master to 1.9 February 27, 2017 14:21
@brb brb merged commit 589ab4f into 1.9 Feb 27, 2017
@@ -15,6 +15,12 @@ CONN_LIMIT=${CONN_LIMIT:-30}
# Default for network policy
EXPECT_NPC=${EXPECT_NPC:-1}

# Ensure we have the required modules for NPC
if [ "${EXPECT_NPC}" != "0" ]; then
modprobe br_netfilter

This comment was marked as abuse.

This comment was marked as abuse.

@bboreham bboreham deleted the issues/2726-modprobe branch March 10, 2017 11:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants