Skip to content

Commit d28c8a8

Browse files
rnatarajashaleman
rnataraja
authored and
shaleman
committed
Support for one Touch provisioning of Contiv as a Container (#367)
* Add support for Net Plugin / Net Master / OVS to be containerized * Changes to Support Build inside a container without vagrant. * Fix minor issues with script * some changes to cleanup and fix issues * Add Mod probe into the Build script * add sudo to modprobe * Script changes to reinit a bridge * Add RC file and source it in the contivInit.sh * Address Review Comments Fix an issue with contivRc not being source correctly * Remove Proxy settings and leave them empty and commented out * fix copy path in the build script * Start/ Restart / Reinit Support via Script * Seperate Build and start/stop scripts
1 parent 99666b0 commit d28c8a8

9 files changed

+302
-3
lines changed

‎Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,18 @@
2020
# docker run --net=host <image> -host-label=<label>
2121
##
2222

23-
FROM golang:1.4
23+
FROM golang:1.5.1
2424
MAINTAINER Madhav Puri <[email protected]> (@mapuri)
2525

26+
27+
# Insert your proxy server settings if this build is running behind
28+
# a proxy.
29+
#ENV http_proxy ""
30+
#ENV https_proxy ""
2631
ENV GOPATH /go/
2732

33+
ENV NET_CONTAINER_BUILD 1
34+
2835
COPY ./ /go/src/github.com/contiv/netplugin/
2936

3037
WORKDIR /go/src/github.com/contiv/netplugin/

‎Makefile

+26-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# find all verifiable packages.
55
# XXX: explore a better way that doesn't need multiple 'find'
6-
PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|vagrant'`
6+
PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|vagrant|netContain'`
77
PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|vagrant'`
88
TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/
99
HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
@@ -39,11 +39,21 @@ deps:
3939
checks:
4040
./scripts/checks "$(PKGS)"
4141

42+
# We cannot perform sudo inside a golang, the only reason to split the rules
43+
# here
44+
ifdef NET_CONTAINER_BUILD
45+
run-build: deps checks clean
46+
cd ${GOPATH}/src/github.com/contiv/netplugin && version/generate_version ${USE_RELEASE} && \
47+
cd $(GOPATH)/src/github.com/contiv/netplugin && \
48+
GOGC=1500 godep go install -v $(TO_BUILD) && \
49+
cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl
50+
else
4251
run-build: deps checks clean
4352
cd ${GOPATH}/src/github.com/contiv/netplugin && version/generate_version ${USE_RELEASE} && \
4453
cd $(GOPATH)/src/github.com/contiv/netplugin && \
4554
GOGC=1500 godep go install -v $(TO_BUILD) && \
4655
sudo cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl
56+
endif
4757

4858
build:
4959
make start
@@ -58,10 +68,15 @@ clean: deps
5868
update:
5969
vagrant box update
6070

71+
6172
# setting CONTIV_NODES=<number> while calling 'make demo' can be used to bring
6273
# up a cluster of <number> nodes. By default <number> = 1
74+
ifdef NET_CONTAINER_BUILD
75+
start:
76+
else
6377
start: update
6478
CONTIV_NODE_OS=${CONTIV_NODE_OS} vagrant up
79+
endif
6580

6681
#kubernetes demo targets
6782
k8s-cluster:
@@ -86,8 +101,12 @@ mesos-docker-destroy:
86101
demo-ubuntu:
87102
CONTIV_NODE_OS=ubuntu make demo
88103

104+
ifdef NET_CONTAINER_BUILD
105+
stop:
106+
else
89107
stop:
90108
CONTIV_NODES=$${CONTIV_NODES:-2} vagrant destroy -f
109+
endif
91110

92111
demo:
93112
make ssh-build
@@ -96,8 +115,13 @@ demo:
96115
ssh:
97116
@vagrant ssh netplugin-node1 -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin/ && bash"' || echo 'Please run "make demo"'
98117

118+
ifdef NET_CONTAINER_BUILD
119+
ssh-build:
120+
cd /go/src/github.com/contiv/netplugin && make run-build
121+
else
99122
ssh-build: start
100-
vagrant ssh netplugin-node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
123+
vagrant ssh netplugin-node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
124+
endif
101125

102126
unit-test: stop clean build
103127
./scripts/unittests -vagrant

‎scripts/netContain/BuildContainer.sh

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#!/usr/bin/bash
2+
3+
function dockerBuildIt {
4+
imgId=`docker build $1 | grep "Successfully built" | cut -d " " -f 3`
5+
6+
if [[ $imgId =~ [0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f] ]]; then
7+
echo "$2 Image has been built with ID $imgId"
8+
return 0
9+
fi
10+
echo "$2 Image was not built properly"
11+
return 255
12+
}
13+
14+
set -x
15+
16+
eexists=`docker images contivbase | grep -w "contivbase" | wc -l`
17+
if [ $eexists != 0 ]; then
18+
echo "An image by name contivbase already exists"
19+
echo "Remove contivbase (docker rmi contivbase) and retry"
20+
exit
21+
fi
22+
23+
ARG1=${1:-none}
24+
if [ $ARG1 == "reinit" ]; then
25+
etcdctl rm -recursive /contiv.io
26+
etcdctl rm -recursive /docker/network
27+
fi
28+
29+
sudo modprobe openvswitch
30+
31+
imgId="Contiv"
32+
dockerBuildIt . $imgId
33+
if [ $? != 0 ]; then
34+
echo "Failed building Contiv Image Bailing out Err $?"
35+
exit
36+
fi
37+
38+
docker run --name=$imgId $imgId 2> /dev/null
39+
40+
echo "Copying the Contiv Binaries from the built container"
41+
docker cp $imgId:/go/bin/netplugin scripts/netContain/
42+
docker cp $imgId:/go/bin/netmaster scripts/netContain/
43+
docker cp $imgId:/go/bin/netctl scripts/netContain/
44+
45+
46+
echo "Removing Intermediate Contiv Container"
47+
docker rm -f $imgId
48+
docker rmi -f $imgId
49+
50+
51+
dockerBuildIt scripts/netContain contivbase
52+
if [ $? != 0 ]; then
53+
echo "Failed building Contiv OVS Container Image, Bailing out Err $?"
54+
exit
55+
fi
56+
57+
docker tag $imgId contivbase
58+
59+
60+
scripts/netContain/contivd.sh start $ARG1

‎scripts/netContain/Dockerfile

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
##
2+
#Copyright 2014 Cisco Systems Inc. All rights reserved.
3+
#
4+
#Licensed under the Apache License, Version 2.0 (the "License");
5+
#you may not use this file except in compliance with the License.
6+
#You may obtain a copy of the License at
7+
#http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
#Unless required by applicable law or agreed to in writing, software
10+
#distributed under the License is distributed on an "AS IS" BASIS,
11+
#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
#See the License for the specific language governing permissions and
13+
#limitations under the License.
14+
##
15+
16+
# One Container for OVS / netplugin / netmaster
17+
18+
FROM ubuntu:14.04
19+
20+
MAINTAINER Rajesh Nataraja <[email protected]>
21+
22+
# Make sure to Modify the Proxy Server values if required
23+
# ENV export http_proxy=http://proxy.localhost.com:8080
24+
# ENV export https_proxy=https://proxy.localhost.com:8080
25+
26+
27+
#Install the Open vSwitch package on this ubuntu container.
28+
RUN apt update
29+
RUN apt --assume-yes install openvswitch-switch
30+
31+
#Copy the Net Plugin Binaries and the Scripts required to
32+
# start the Net Plugin and Net Master.
33+
34+
RUN mkdir -p /contiv/bin
35+
RUN mkdir -p /contiv/scripts
36+
37+
COPY ./netplugin /contiv/bin/
38+
COPY ./netmaster /contiv/bin/
39+
COPY ./ovsInit.sh /contiv/scripts/
40+
COPY ./contivInit.sh /contiv/scripts/
41+
COPY ./contivNet.sh /contiv/scripts/
42+
COPY ./contivRc /contiv/scripts/
43+
44+
45+
ENTRYPOINT ["/contiv/scripts/contivNet.sh"]

‎scripts/netContain/contivInit.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
#Initialize contiv Net Plugin and Net Master as required
3+
# Values below need to be tailored as per needs
4+
5+
set -x
6+
7+
source /contiv/scripts/contivRc
8+
9+
if [ $IS_NETMASTER == 1 ]
10+
then
11+
/contiv/bin/netmaster 2> /var/log/contiv/netmaster.errlog 1> /var/log/contiv/netmaster.log &
12+
fi
13+
14+
echo "$NETMASTER_IP netmaster" > /etc/hosts
15+
echo "0.0.0.0 localhost" >> /etc/hosts
16+
export no_proxy="0.0.0.0, $NETMASTER_IP"
17+
18+
if [ not $CONTIV_FWD_MODE == "routing" ]
19+
then
20+
CONTIV_FWD_MODE="bridged"
21+
fi
22+
23+
/contiv/bin/netplugin -vtep-ip $VTEP_IP -vlan-if $VLAN_IF -fwd-mode $CONTIV_FWD_MODE 2> /var/log/contiv/netplugin.errlog 1> /var/log/contiv/netplugin.log &
24+

‎scripts/netContain/contivNet.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
#Initialize complete contiv container. Start OVS and Net Plugin
3+
4+
ARG1=${1:-none}
5+
6+
if [ $ARG1 == "reinit" ]; then
7+
ovs-vsctl del-br contivVlanBridge
8+
ovs-vsctl del-br contivVxlanBridge
9+
fi
10+
11+
/contiv/scripts/ovsInit.sh
12+
/contiv/scripts/contivInit.sh
13+
14+
15+
while true; do sleep 1; done

‎scripts/netContain/contivRc

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# RC file for passing or tuning contiv parameters correctly. Please set
2+
# them as necessary and described below.
3+
4+
# IF this contiv node needs to run as netmaster, set the following to 1
5+
IS_NETMASTER=0
6+
7+
# This IP currently is only used to set the no_proxy before starting the
8+
# netplugin process
9+
NETMASTER_IP="172.28.11.253"
10+
11+
# VTEP IP address used for VXLAN encapsulation. This should be one
12+
# routable within the contiv cluster
13+
VTEP_IP="172.28.11.252"
14+
15+
# Interface used for Sending Dot1Q tagged packets in bridged mode
16+
# Or
17+
# Interface used for routing vlan encapped networks across Contiv Nodes
18+
# Also used for BGP when started
19+
VLAN_IF="ens32"
20+
21+
#routing or bridged
22+
CONTIV_FWD_MODE="routing"

‎scripts/netContain/contivd.sh

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#!/usr/bin/bash
2+
3+
set -x
4+
5+
function usage {
6+
echo "contivd.sh { {start | restart} [reinit] } | {stop}"
7+
}
8+
9+
sudo mkdir -p /var/log/contiv
10+
sudo mkdir -p /var/run/openvswitch
11+
12+
eexists=`docker images contivbase | grep -w "contivbase" | wc -l`
13+
if [ $eexists == 0 ]; then
14+
echo "contivbase image has not been created, First Build contivbase"
15+
exit
16+
fi
17+
18+
arg=${1:-none}
19+
20+
for arg in $*; do
21+
case $arg in
22+
"reinit" )
23+
reinitContiv=true
24+
;;
25+
"restart" )
26+
restartContiv=true
27+
;;
28+
"stop" )
29+
docker stop contivNet
30+
exit
31+
;;
32+
"start" )
33+
startNow=true
34+
;;
35+
"none" )
36+
usage
37+
exit
38+
;;
39+
esac
40+
done
41+
42+
spawned=`docker ps | grep -w "contivNet" | wc -l`
43+
stopped=`docker ps -a | grep -w "contivNet" | grep "Exited" | wc -l`
44+
45+
if [ $startNow ]; then
46+
if [ $spawned != 0 ]; then
47+
echo "contivNet is Already Running, Try Stopping or restart"
48+
exit
49+
fi
50+
fi
51+
52+
53+
if [ $restartContiv ]; then
54+
if [ $spawned == 0 ]; then
55+
echo "contivNet has not been spawned, Try Start"
56+
exit
57+
fi
58+
if [ $stopped == 0 ]; then
59+
docker stop contivNet
60+
stopped=1
61+
fi
62+
fi
63+
64+
65+
reinitArg=""
66+
if [ $reinitContiv ]; then
67+
docker rm -f contivNet
68+
reinitArg="reinit"
69+
etcdctl rm -recursive /contiv.io
70+
etcdctl rm -recursive /docker/network
71+
fi
72+
73+
74+
sudo modprobe openvswitch
75+
if [ $stopped != 0 ]; then
76+
docker start contivNet
77+
else
78+
docker run -itd --net=host --name=contivNet --privileged -v /etc/openvswitch:/etc/openvswitch -v /var/run/:/var/run -v /var/log/contiv:/var/log/contiv contivbase "$reinitArg"
79+
fi

‎scripts/netContain/ovsInit.sh

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
#Start OVS in the Contiv Container
3+
4+
sleep 2
5+
6+
if [ -d "/etc/openvswitch" ]; then
7+
if [ -f "/etc/openvswitch/conf.db" ]; then
8+
echo "DB Exists No Need to Create"
9+
else
10+
ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema
11+
fi
12+
else
13+
echo "Open V Switch not mounted from Host"
14+
fi
15+
16+
ovsdb-server --remote=punix:/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --log-file=/var/log/contiv/ovs-db.log -vsyslog:dbg -vfile:dbg --pidfile --detach /etc/openvswitch/conf.db
17+
18+
ovs-vswitchd -v --pidfile --detach --log-file=/var/log/contiv/ovs-vswitchd.log -vconsole:err -vsyslog:info -vfile:info &
19+
20+
ovs-vsctl set-manager tcp:127.0.0.1:6640
21+
22+
ovs-vsctl set-manager ptcp:6640
23+

0 commit comments

Comments
 (0)