Merge pull request openshift#19306 from smarterclayton/manifests

Remove openvswitch from node system container

Author: openshift-merge-robot

images/node/system-container/config.json.template

@@ -340,16 +340,6 @@
 		"mode=755"
 	    ]
         },
-        {
-	    "type": "bind",
-	    "source": "$ORIGIN_CONFIG_DIR/openvswitch",
-	    "destination": "/etc/openvswitch",
-	    "options": [
-		"rbind",
-		"rw",
-		"mode=755"
-	    ]
-        },
         {
 	    "type": "bind",
 	    "source": "$ORIGIN_DATA_DIR",
@@ -454,16 +444,6 @@
 		"ro"
 	    ]
         },
-        {
-	    "type": "bind",
-	    "source": "$ORIGIN_CONFIG_DIR/sdn",
-	    "destination": "/etc/openshift-sdn",
-	    "options": [
-		"rbind",
-		"rw",
-		"mode=755"
-	    ]
-        },
         {
 	    "type": "bind",
 	    "source": "$ORIGIN_CONFIG_DIR/node",

images/node/system-container/manifest.json

@@ -7,7 +7,6 @@
         "KUBELET_DATA_DIR": "/var/lib/kubelet",
         "MASTER_SERVICE": "atomic-openshift-master.service",
         "DOCKER_SERVICE": "docker.service",
-        "OPENVSWITCH_SERVICE": "openvswitch.service",
         "ADDTL_MOUNTS": ""
     }
 }

images/node/system-container/service.template

@@ -1,6 +1,5 @@
 [Unit]
 After=${DOCKER_SERVICE}
-After=${OPENVSWITCH_SERVICE}
 Wants=${DOCKER_SERVICE}
 After=$NAME-dep.service
 After=${MASTER_SERVICE}