diff options
Diffstat (limited to 'deployments')
| -rw-r--r-- | deployments/docker-compose.yml | 31 | ||||
| -rwxr-xr-x | deployments/start.sh | 9 |
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 |