summaryrefslogtreecommitdiffstats
path: root/deployments
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-09-11 08:50:28 -0700
committerVictor Morales <victor.morales@intel.com>2018-09-11 08:50:28 -0700
commitcb64a5fed1b10daa301235a2ef956b4805da99d3 (patch)
treedf087f339bd7c62d1bae209227393f1ac670872a /deployments
parente7a7b50f6fc0f036eeb116f95e8e5fb8d56aa4ef (diff)
Complete Plugin Functional Tests
It was fixed the issue to connect the plugin with the consul DB. This was a main roadblock to complete the functional Tests for the plugin. Change-Id: I3032e82a8f6baf4739c7433a5ffa97dac23daac8 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
Diffstat (limited to 'deployments')
-rw-r--r--deployments/docker-compose.yml31
-rwxr-xr-xdeployments/start.sh9
2 files changed, 33 insertions, 7 deletions
diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml
index d1b78990..6c9c85ec 100644
--- a/deployments/docker-compose.yml
+++ b/deployments/docker-compose.yml
@@ -14,6 +14,9 @@ version: '2'
services:
multicloud-k8s:
image: nexus3.onap.org:10003/onap/multicloud/k8plugin
+ networks:
+ multicloud_net:
+ ipv4_address: 172.19.0.3
build:
context: ./
args:
@@ -26,18 +29,38 @@ services:
- CSAR_DIR=/opt/csar
- KUBE_CONFIG_DIR=/opt/kubeconfig
- DATABASE_TYPE=consul
- - DATABASE_IP=consul-svr
+ - DATABASE_IP=172.19.0.2
- PLUGINS_DIR=/opt/multicloud/k8s
+ - HTTP_PROXY=$HTTP_PROXY
+ - HTTPS_PROXY=$HTTPS_PROXY
+ - NO_PROXY=$NO_PROXY,172.19.0.2
depends_on:
- - "consul"
+ - consul
+ links:
+ - consul
volumes:
- /opt/csar:/opt/csar
- /opt/kubeconfig:/opt/kubeconfig
consul:
image: consul
- hostname: consul-svr
+ networks:
+ multicloud_net:
+ ipv4_address: 172.19.0.2
environment:
- - CONSUL_LOCAL_CONFIG={"datacenter":"us_west","server":true}
+ CONSUL_CLIENT_INTERFACE: 'eth0'
+ CONSUL_BIND_INTERFACE: 'eth0'
+ HTTP_PROXY: $HTTP_PROXY
+ HTTPS_PROXY: $HTTPS_PROXY
+ NO_PROXY: $NO_PROXY
command: ["agent", "-server", "-bootstrap-expect=1"]
volumes:
- /opt/consul/config:/consul/config
+
+networks:
+ multicloud_net:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ -
+ subnet: 172.19.0.0/27
diff --git a/deployments/start.sh b/deployments/start.sh
index 0a14fc35..19c5ff8c 100755
--- a/deployments/start.sh
+++ b/deployments/start.sh
@@ -11,22 +11,25 @@
set -o nounset
set -o pipefail
+source /etc/environment
+
k8s_path="$(git rev-parse --show-toplevel)"
export GOPATH=$k8s_path
export CSAR_DIR=/opt/csar
export KUBE_CONFIG_DIR=/opt/kubeconfig
export DATABASE_TYPE=consul
-export DATABASE_IP=consul-svr
export PLUGINS_DIR=$k8s_path/src/k8splugin/plugins
echo "Starting consul services"
docker-compose kill
docker-compose up -d consul
-echo "Compiling source code"
+export DATABASE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' deployments_consul_1)
+export no_proxy=$no_proxy,$DATABASE_IP
+export NO_PROXY=$NO_PROXY,$DATABASE_IP
+echo "Compiling source code"
pushd $k8s_path/src/k8splugin/
-make clean
make plugins
go run cmd/main.go
popd