Merge pull request #294 from mapuri/netctl

shaleman · shaleman · commit cfa8f49feb25 · 2016-02-26T11:48:47.000-08:00
use netmaster service name as default for netctl
diff --git a/netctl/netctl.go b/netctl/netctl.go
@@ -16,7 +16,7 @@ import (
 )
 
 // DefaultMaster is the master to use when none is provided.
-const DefaultMaster = "http://localhost:9999"
+const DefaultMaster = "http://netmaster:9999"
 
 func getClient(ctx *cli.Context) *contivClient.ContivClient {
 	cl, err := contivClient.NewContivClient(ctx.GlobalString("netmaster"))
diff --git a/netmaster/master/consts.go b/netmaster/master/consts.go
@@ -16,9 +16,6 @@ limitations under the License.
 package master
 
 const (
-	// DaemonURL is default url used by netmaster to listen for http requests
-	DaemonURL = "localhost:9999"
-
 	//DesiredConfigRESTEndpoint is the REST endpoint to post desired configuration
 	DesiredConfigRESTEndpoint = "desired-config"
 	//AddConfigRESTEndpoint is the REST endpoint to post configuration additions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// DefaultMaster is the master to use when none is provided.`
`19`		`-const DefaultMaster = "http://localhost:9999"`
	`19`	`+const DefaultMaster = "http://netmaster:9999"`
`20`	`20`
`21`	`21`	`func getClient(ctx cli.Context) contivClient.ContivClient {`
`22`	`22`	`cl, err := contivClient.NewContivClient(ctx.GlobalString("netmaster"))`