1
0
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00

Build docker-sys bridge via system-docker args and remove cni-glue

This commit is contained in:
niusmallnan
2018-04-16 14:16:08 +08:00
parent da8d5ed027
commit ba388b6bc6
10 changed files with 31 additions and 52 deletions

View File

@@ -25,7 +25,6 @@ import (
"github.com/rancher/os/config/cloudinit/datasource/metadata"
"github.com/rancher/os/config/cloudinit/pkg"
"github.com/rancher/os/log"
"github.com/vishvananda/netlink"
)
const (
@@ -44,14 +43,10 @@ func NewDatasource(root string) []*MetadataService {
roots := make([]string, 0, 5)
if root == "" {
if links, err := netlink.LinkList(); err == nil {
if links, err := netconf.GetValidLinkList(); err == nil {
log.Infof("Checking to see if a cloudstack server-identifier is available")
for _, link := range links {
linkName := link.Attrs().Name
if linkName == "lo" {
continue
}
log.Infof("searching for cloudstack server %s on %s", serverIdentifier, linkName)
lease := netconf.GetDhcpLease(linkName)
if server, ok := lease[serverIdentifier]; ok {