script changes

diff --git a/20-macvlan0.conf b/20-macvlan0.conf
index a3f4bf2..cee25bd 100644 (file)
--- a/20-macvlan0.conf
+++ b/20-macvlan0.conf
@@ -2,7 +2,7 @@
     "cniVersion": "0.2.0",
     "name": "macvlan0",
     "type": "macvlan",
-    "master": "em1",
+    "master": "eth0",
     "args" : {
       "org.apache.mesos" : {
         "network_info" : {

diff --git a/mcc-manual-add-static-env.sh b/mcc-manual-add-static-env.sh
index 7a704a9..24ed273 100755 (executable)
--- a/mcc-manual-add-static-env.sh
+++ b/mcc-manual-add-static-env.sh
@@ -1,8 +1,8 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
 export CNI_COMMAND=ADD
 export CNI_NETNS=/var/run/netns/mcc-cni-test0
@@ -21,6 +21,7 @@ export MCCVAL="Jamal Env Value"
 
 echo $CNI_ARGS
 
-bin/macvlan < /etc/cni/net.d/20-macvlan0.conf
+#macvlan < /etc/cni/net.d/20-macvlan0.conf
+macvlan < 20-macvlan0.conf
 
 

diff --git a/mcc-manual-del-static-env.sh b/mcc-manual-del-static-env.sh
index 8c8afa7..f9eb61b 100755 (executable)
--- a/mcc-manual-del-static-env.sh
+++ b/mcc-manual-del-static-env.sh
@@ -1,8 +1,8 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
 export CNI_COMMAND=DEL
 export CNI_NETNS=/var/run/netns/mcc-cni-test0
@@ -21,6 +21,7 @@ export MCCVAL="Jamal Env Value"
 
 echo $CNI_ARGS
 
-bin/macvlan < /etc/cni/net.d/20-macvlan0.conf
+#macvlan < /etc/cni/net.d/20-macvlan0.conf
+macvlan < 20-macvlan0.conf