etcd: allow changing listening address

Change-Id: I921f9ff41c48af3e88f6d6130c024a1d37b88691 Reviewed-on: https://softwarefactory-project.io/r/7498 Reviewed-by: Sylvain Afchain <safchain@gmail.com> Tested-by: Sylvain Afchain <safchain@gmail.com> Workflow: Sylvain Afchain <safchain@gmail.com> Tested-by: Jenkins CI <jenkins@softwarefactory-project.io>
skydive-project · Apr 25, 2017 · e23c80a · e23c80a
1 parent c56cf49
commit e23c80a
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/config/config.go b/config/config.go
@@ -73,7 +73,7 @@ func init() {
 	cfg.SetDefault("netns.run_path", "/var/run/netns")
 	cfg.SetDefault("etcd.data_dir", "/var/lib/skydive/etcd")
 	cfg.SetDefault("etcd.embedded", true)
-	cfg.SetDefault("etcd.port", 2379)
+	cfg.SetDefault("etcd.listen", "localhost:2379")
 	cfg.SetDefault("auth.type", "noauth")
 	cfg.SetDefault("auth.keystone.tenant", "admin")
 	cfg.SetDefault("storage.orientdb.addr", "http://localhost:2480")

diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - SKYDIVE_STORAGE_ELASTICSEARCH_HOST=elasticsearch:9200
       - SKYDIVE_ANALYZER_STORAGE_BACKEND=elasticsearch
       - SKYDIVE_GRAPH_BACKEND=elasticsearch
+      - SKYDIVE_ETCD_LISTEN=0.0.0.0:2379
 
   skydive-agent:
     image: skydive/skydive

diff --git a/contrib/kubernetes/skydive.yaml b/contrib/kubernetes/skydive.yaml
@@ -48,6 +48,8 @@ spec:
           value: elasticsearch
         - name: SKYDIVE_GRAPH_BACKEND
           value: elasticsearch
+        - name: SKYDIVE_ETCD_LISTEN
+          value: 0.0.0.0:2379
       - name: skydive-elasticsearch
         image: elasticsearch:2
         ports:
@@ -92,6 +94,6 @@ spec:
       - name: run
         hostPath:
           path: /var/run/netns
-#      - name: ovsdb
-#        hostPath:
-#          path: /var/run/openvswitch/db.sock
+      - name: ovsdb
+        hostPath:
+          path: /var/run/openvswitch/db.sock
diff --git a/contrib/openshift/skydive-template.yaml b/contrib/openshift/skydive-template.yaml
@@ -64,6 +64,8 @@ objects:
             value: elasticsearch
           - name: SKYDIVE_GRAPH_BACKEND
             value: elasticsearch
+          - name: SKYDIVE_ETCD_LISTEN
+            value: 0.0.0.0:2379
           image: skydive/skydive
           imagePullPolicy: Always
           livenessProbe:

diff --git a/contrib/vagrant/setup-analyzer.sh b/contrib/vagrant/setup-analyzer.sh
@@ -30,6 +30,7 @@ analyzer:
       - TOR1_PORT2 -> *[Type=host,Name=agent2]/eth1
 etcd:
   client_timeout: 100
+  listen: 0.0.0.0:2379
 graph:
   backend: elasticsearch
 elasticsearch:

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -29,7 +29,7 @@ SKYDIVE_ANALYZER_LISTEN=${SKYDIVE_ANALYZER_LISTEN:-$SERVICE_HOST:8082}
 SKYDIVE_ANALYZERS=${SKYDIVE_ANALYZERS:-$SKYDIVE_ANALYZER_LISTEN}
 
 # Configure the skydive agent with the etcd server address
-SKYDIVE_AGENT_ETCD=${SKYDIVE_AGENT_ETCD:-http://$SERVICE_HOST:2379}
+SKYDIVE_AGENT_ETCD=${SKYDIVE_AGENT_ETCD:-$SERVICE_HOST:2379}
 
 # ip:port address on which skydive agent listens for connections.
 SKYDIVE_AGENT_LISTEN=${SKYDIVE_AGENT_LISTEN:-"127.0.0.1:8081"}
@@ -165,8 +165,9 @@ openstack:
 
 etcd:
   servers:
-    - $SKYDIVE_AGENT_ETCD
+    - http://$SKYDIVE_AGENT_ETCD
   data_dir: /tmp/skydive-etcd
+  listen: $SKYDIVE_AGENT_ETCD
 
 graph:
   backend: elasticsearch

diff --git a/etc/skydive.yml.default b/etc/skydive.yml.default
@@ -199,6 +199,7 @@ auth:
 etcd:
   # when 'embedded' is set to true, the analyzer will start an embedded etcd server
   # embedded: true
+  # listen: localhost:2379
 
   # both the analyzers and the agents make use of etcd
   # servers:

diff --git a/etcd/server.go b/etcd/server.go
@@ -37,6 +37,7 @@ import (
 	"github.com/coreos/etcd/pkg/osutil"
 	"github.com/coreos/etcd/pkg/types"
 
+	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/config"
 
 	"golang.org/x/net/context"
@@ -45,9 +46,6 @@ import (
 const (
 	memberName   = "skydive"
 	startTimeout = 10 * time.Second
-	// No peer URL exists but etcd doesn't allow the value to be empty.
-	peerURL    = "http://localhost:2379"
-	clusterCfg = memberName + "=" + peerURL
 )
 
 // EmbeddedEtcd provides a single node etcd server.
@@ -58,10 +56,10 @@ type EmbeddedEtcd struct {
 	dataDir  string
 }
 
-func NewEmbeddedEtcd(port int, dataDir string) (*EmbeddedEtcd, error) {
+func NewEmbeddedEtcd(sa common.ServiceAddress, dataDir string) (*EmbeddedEtcd, error) {
 	var err error
-	se := &EmbeddedEtcd{Port: port}
-	se.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", port))
+	se := &EmbeddedEtcd{Port: sa.Port}
+	se.listener, err = net.Listen("tcp", fmt.Sprintf("%s:%d", sa.Addr, sa.Port))
 	if err != nil {
 		return nil, err
 	}
@@ -73,7 +71,8 @@ func NewEmbeddedEtcd(port int, dataDir string) (*EmbeddedEtcd, error) {
 		return nil, err
 	}
 
-	peerURLs, err := types.NewURLs([]string{peerURL})
+	endpoint := fmt.Sprintf("http://%s:%d", sa.Addr, sa.Port)
+	peerURLs, err := types.NewURLs([]string{endpoint})
 	if err != nil {
 		se.Stop()
 		return nil, err
@@ -106,7 +105,7 @@ func NewEmbeddedEtcd(port int, dataDir string) (*EmbeddedEtcd, error) {
 	// Wait for etcd server to be ready
 	t := time.Now().Add(startTimeout)
 	etcdClient, err := etcd.New(etcd.Config{
-		Endpoints:               []string{fmt.Sprintf("http://localhost:%d", port)},
+		Endpoints:               []string{endpoint},
 		Transport:               etcd.DefaultTransport,
 		HeaderTimeoutPerRequest: time.Second,
 	})
@@ -130,9 +129,12 @@ func NewEmbeddedEtcd(port int, dataDir string) (*EmbeddedEtcd, error) {
 
 func NewEmbeddedEtcdFromConfig() (*EmbeddedEtcd, error) {
 	dataDir := config.GetConfig().GetString("etcd.data_dir")
-	port := config.GetConfig().GetInt("etcd.port")
-
-	return NewEmbeddedEtcd(port, dataDir)
+	listen := config.GetConfig().GetString("etcd.listen")
+	sa, err := common.ServiceAddressFromString(listen)
+	if err != nil {
+		return nil, err
+	}
+	return NewEmbeddedEtcd(sa, dataDir)
 }
 
 func (se *EmbeddedEtcd) Stop() error {

diff --git a/scripts/scale.sh b/scripts/scale.sh
@@ -293,6 +293,7 @@ etcd:
   data_dir: $TEMP_DIR/$NAME-etcd
   servers:
     - http://$ETCD
+  listen: $ETCD
 storage:
   elasticsearch:
     host: $ELASTICSEARCH