From e06f5da88d67be4856fb76f380107f683d542160 Mon Sep 17 00:00:00 2001 From: Michael C Cambria Date: Thu, 31 Aug 2017 16:02:48 +0000 Subject: [PATCH] Use args ips instead of CNI_ARGS to select static IP address --- mesos-test-add.sh | 2 +- mesos-test-del.sh | 2 +- mesos-test.conf | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mesos-test-add.sh b/mesos-test-add.sh index 2440507..60c75d0 100755 --- a/mesos-test-add.sh +++ b/mesos-test-add.sh @@ -3,7 +3,7 @@ export DEBUG=1 export NETCONFPATH=/home/mcc/go/src/github.com/containernetworking/plugins export CNI_PATH=/home/mcc/go/src/github.com/containernetworking/plugins/bin -export CNI_ARGS="IP=10.244.10.20" +#export CNI_ARGS="IP=10.244.10.20" export MCCVAL="Jamal Env Value" sudo -E /home/mcc/go/src/github.com/containernetworking/cni/cnitool/cnitool add mesos-test /var/run/netns/test0 diff --git a/mesos-test-del.sh b/mesos-test-del.sh index 4d41c6a..5b136ce 100755 --- a/mesos-test-del.sh +++ b/mesos-test-del.sh @@ -3,7 +3,7 @@ export DEBUG=1 export NETCONFPATH=/home/mcc/go/src/github.com/containernetworking/plugins export CNI_PATH=/home/mcc/go/src/github.com/containernetworking/plugins/bin -export CNI_ARGS="IP=10.244.10.20" +#export CNI_ARGS="IP=10.244.10.20" export MCCVAL="Jamal Env Value" sudo -E /home/mcc/go/src/github.com/containernetworking/cni/cnitool/cnitool del mesos-test /var/run/netns/test0 diff --git a/mesos-test.conf b/mesos-test.conf index 6704b98..a2ccae6 100644 --- a/mesos-test.conf +++ b/mesos-test.conf @@ -15,15 +15,16 @@ { "key" : "app", "value" : "myapp" }, { "key" : "mccKey1", "value" : "mccVal1" }, { "key" : "bs", "value" : "bsVal" }, - { "key" : "StaticIP", "value" : "172.19.0.209" }, - { "key" : "Uplink", "value" : "eth1p0" }, - { "key" : "viaIP", "value" : "172.19.0.1" }, + { "key" : "StaticIP", "value" : "10.244.10.22"}, + { "key" : "Uplink", "value" : "eth0" }, + { "key" : "viaIP", "value" : "10.244.10.1" }, { "key" : "mccKey2", "value" : "mccVal2" }, { "key" : "env", "value" : "prod" } ] } } - } + }, +"ips": ["10.244.10.23"] }, "ipam": { "type": "host-local", -- 2.44.0