Merge pull request #12138 from jim-minter/issue12111

Merged by openshift-bot
openshift · Dec 9, 2016 · 69afb3a · 69afb3a
2 parents 3218d3a + 8c6720a
commit 69afb3a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/bootstrap/docker/openshift/helper.go b/pkg/bootstrap/docker/openshift/helper.go
@@ -235,6 +235,10 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
 	env = append(env, opt.Environment...)
 	binds = append(binds, fmt.Sprintf("%s:/var/lib/origin/openshift.local.config:z", opt.HostConfigDir))
 
+	// Kubelet needs to be able to write to
+	// /sys/devices/virtual/net/vethXXX/brport/hairpin_mode, so make this rw, not ro.
+	binds = append(binds, "/sys/devices/virtual/net:/sys/devices/virtual/net:rw")
+
 	// Check if a configuration exists before creating one if UseExistingConfig
 	// was specified
 	var configDir string