remove debug

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов 2015-03-30 12:05:49 +03:00
parent 2be9bc5c43
commit e86ab7a185
2 changed files with 4 additions and 4 deletions

5
build
View File

@ -6,6 +6,7 @@ REPO_PATH="${ORG_PATH}/cloudinit"
export GOBIN=${PWD}/bin export GOBIN=${PWD}/bin
export GOPATH=${PWD}/third_party export GOPATH=${PWD}/third_party
export CGO_ENABLED=0 export CGO_ENABLED=0
mkdir -p $GOBIN
if [ ! -h $GOPATH/src/${REPO_PATH} ]; then if [ ! -h $GOPATH/src/${REPO_PATH} ]; then
mkdir -p $GOPATH/src/${ORG_PATH} mkdir -p $GOPATH/src/${ORG_PATH}
@ -13,6 +14,6 @@ if [ ! -h $GOPATH/src/${REPO_PATH} ]; then
fi fi
for os in linux freebsd; do for os in linux freebsd; do
GOOS=${os} go build -x -a -installsuffix cgo -o bin/cloudinit-linux-x86_64 ${REPO_PATH} GOOS=${os} go build -x -a -installsuffix cgo -o bin/cloudinit-${os}-x86_64 ${REPO_PATH}
GOOS=${os} GOARCH=386 go build -x -a -installsuffix cgo -o bin/cloudinit-linux-x86_32 ${REPO_PATH} GOOS=${os} GOARCH=386 go build -x -a -installsuffix cgo -o bin/cloudinit-${os}-x86_32 ${REPO_PATH}
done done

View File

@ -18,7 +18,6 @@ package openstack
import ( import (
"encoding/json" "encoding/json"
"log"
"net" "net"
"strconv" "strconv"
@ -99,7 +98,7 @@ func (ms *metadataService) FetchMetadata() (metadata datasource.Metadata, err er
metadata.PrivateIPv6 = net.ParseIP(m.Interfaces.Private[0].IPv6.IPAddress) metadata.PrivateIPv6 = net.ParseIP(m.Interfaces.Private[0].IPv6.IPAddress)
} }
} }
log.Printf("aaa %+v\n", m)
metadata.Hostname = m.Hostname metadata.Hostname = m.Hostname
metadata.SSHPublicKeys = map[string]string{} metadata.SSHPublicKeys = map[string]string{}
metadata.SSHPublicKeys[strconv.Itoa(0)] = m.PublicKeys["root"] metadata.SSHPublicKeys[strconv.Itoa(0)] = m.PublicKeys["root"]