diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-09-10 02:19:43 -0700 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2018-09-10 02:24:08 -0700 |
| commit | e7a7b50f6fc0f036eeb116f95e8e5fb8d56aa4ef (patch) | |
| tree | ddb30ce6aae8e593f8c6d03f51e2c2058bd6bf21 /vagrant | |
| parent | 5b6f0c4efbfdc0c9bcb440c8da132bdaee4e518d (diff) | |
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
Diffstat (limited to 'vagrant')
| -rwxr-xr-x | vagrant/installer.sh | 4 | ||||
| -rwxr-xr-x | vagrant/tests/plugin.sh | 2 |
2 files changed, 5 insertions, 1 deletions
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: |