Merge pull request #17011 from resouer/patch-9
Auto commit by PR queue bot
This commit is contained in:
@@ -96,7 +96,17 @@ detect_lsb() {
|
||||
|
||||
# Start the bootstrap daemon
|
||||
bootstrap_daemon() {
|
||||
sudo -b docker -d -H unix:///var/run/docker-bootstrap.sock -p /var/run/docker-bootstrap.pid --iptables=false --ip-masq=false --bridge=none --graph=/var/lib/docker-bootstrap 2> /var/log/docker-bootstrap.log 1> /dev/null
|
||||
sudo -b \
|
||||
docker \
|
||||
-d \
|
||||
-H unix:///var/run/docker-bootstrap.sock \
|
||||
-p /var/run/docker-bootstrap.pid \
|
||||
--iptables=false \
|
||||
--ip-masq=false \
|
||||
--bridge=none \
|
||||
--graph=/var/lib/docker-bootstrap \
|
||||
2> /var/log/docker-bootstrap.log \
|
||||
1> /dev/null
|
||||
|
||||
sleep 5
|
||||
}
|
||||
@@ -106,12 +116,24 @@ DOCKER_CONF=""
|
||||
# Start k8s components in containers
|
||||
start_k8s() {
|
||||
# Start flannel
|
||||
flannelCID=$(sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --restart=always --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.3 /opt/bin/flanneld --etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
|
||||
flannelCID=$(sudo \
|
||||
docker \
|
||||
-H unix:///var/run/docker-bootstrap.sock \
|
||||
run \
|
||||
-d \
|
||||
--restart=always \
|
||||
--net=host \
|
||||
--privileged \
|
||||
-v /dev/net:/dev/net \
|
||||
quay.io/coreos/flannel:0.5.3 \
|
||||
/opt/bin/flanneld \
|
||||
--etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
|
||||
|
||||
sleep 8
|
||||
|
||||
# Copy flannel env out and source it on the host
|
||||
sudo docker -H unix:///var/run/docker-bootstrap.sock cp ${flannelCID}:/run/flannel/subnet.env .
|
||||
sudo docker -H unix:///var/run/docker-bootstrap.sock \
|
||||
cp ${flannelCID}:/run/flannel/subnet.env .
|
||||
source subnet.env
|
||||
|
||||
# Configure docker net settings, then restart it
|
||||
|
Reference in New Issue
Block a user