ssue 59: Multi Ip Enviromment support + publicUrl is disregarded by

master

3 files changed, 5 insertions, 4 deletions

diff --git a/go/operation/allocate_volume.go b/go/operation/allocate_volume.go
index dee114f21..71b08405a 100644
--- a/go/operation/allocate_volume.go
+++ b/go/operation/allocate_volume.go
@@ -18,7 +18,7 @@ func AllocateVolume(dn *topology.DataNode, vid storage.VolumeId, collection stri
 	values.Add("volume", vid.String())
 	values.Add("collection", collection)
 	values.Add("replicationType", repType.String())
-	jsonBlob, err := util.Post("http://"+dn.Url()+"/admin/assign_volume", values)
+	jsonBlob, err := util.Post("http://"+dn.PublicUrl+"/admin/assign_volume", values)
 	if err != nil {
 		return err
 	}
diff --git a/go/weed/master.go b/go/weed/master.go
index 434a0327b..f4c2ed087 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -27,6 +27,7 @@ var cmdMaster = &Command{
 
 var (
 	mport                 = cmdMaster.Flag.Int("port", 9333, "http listen port")
+	mip                   = cmdMaster.Flag.String("ip", "localhost", "http listen port")
 	metaFolder            = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store mappings")
 	volumeSizeLimitMB     = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes")
 	mpulse                = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
@@ -55,9 +56,9 @@ func runMaster(cmd *Command, args []string) bool {
 		*volumeSizeLimitMB, *mpulse, *confFile, *defaultRepType, *garbageThreshold, masterWhiteList,
 	)
 
-	glog.V(0).Infoln("Start Weed Master", VERSION, "at port", strconv.Itoa(*mport))
+	glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *mip+":"+strconv.Itoa(*mport))
 	srv := &http.Server{
-		Addr:        ":" + strconv.Itoa(*mport),
+		Addr:        *mip+":" + strconv.Itoa(*mport),
 		Handler:     r,
 		ReadTimeout: time.Duration(*mReadTimeout) * time.Second,
 	}
diff --git a/go/weed/volume.go b/go/weed/volume.go
index b9c6553e5..d3be1c3e4 100644
--- a/go/weed/volume.go
+++ b/go/weed/volume.go
@@ -87,7 +87,7 @@ func runVolume(cmd *Command, args []string) bool {
 
 	glog.V(0).Infoln("Start Weed volume server", VERSION, "at http://"+*ip+":"+strconv.Itoa(*vport))
 	srv := &http.Server{
-		Addr:        ":" + strconv.Itoa(*vport),
+		Addr:        *ip + ":" + strconv.Itoa(*vport),
 		Handler:     r,
 		ReadTimeout: (time.Duration(*vReadTimeout) * time.Second),
 	}