From e7a7b50f6fc0f036eeb116f95e8e5fb8d56aa4ef Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Mon, 10 Sep 2018 02:19:43 -0700
Subject: Add no_proxy config value to docker-compose.yml

The no_proxy configuration value was missing in the docker-compose.yml
this was causing a different behaviour when the functional tests were
running and consuming the services on the container.

Change-Id: Ie88e88d50e0ec9c4aa0d03367f2a9d25edccb753
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-301
---
 vagrant/installer.sh    | 4 ++++
 vagrant/tests/plugin.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'vagrant')

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index 5e3b32d8..5df87e4c 100755
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -171,6 +171,10 @@ function install_plugin {
 
     mkdir -p /opt/{csar,kubeconfig,consul/config}
     cp $HOME/.kube/config /opt/kubeconfig/krd
+    export CSAR_DIR=/opt/csar
+    export KUBE_CONFIG_DIR=/opt/kubeconfig
+    echo "export CSAR_DIR=${CSAR_DIR}" >> /etc/environment
+    echo "export KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR}" >> /etc/environment
 
     GOPATH=$(go env GOPATH)
     pushd $GOPATH/src/k8-plugin-multicloud/deployments
diff --git a/vagrant/tests/plugin.sh b/vagrant/tests/plugin.sh
index 3ff3a54d..2c01c517 100755
--- a/vagrant/tests/plugin.sh
+++ b/vagrant/tests/plugin.sh
@@ -38,7 +38,7 @@ docker run --name aai -v $(mktemp):/tmp/generic_sim/ -v $(pwd)/generic_simulator
 vnf_id_list=$(curl -s "${base_url}${cloud_region_id}/${namespace}" | jq -r '.vnf_id_list')
 
 mkdir -p ${CSAR_DIR}/${csar_id}
-cat << SEQ > ${CSAR_DIR}/${csar_id}/sequence.yaml
+cat << SEQ > ${CSAR_DIR}/${csar_id}/metadata.yaml
 deployment:
   - deployment.yaml
 service:
-- 
cgit 1.2.3-korg