diff options
Diffstat (limited to 'deployments')
| -rw-r--r-- | deployments/.env | 7 | ||||
| -rw-r--r-- | deployments/docker-compose.yml | 32 | ||||
| -rwxr-xr-x | deployments/start.sh | 3 |
3 files changed, 23 insertions, 19 deletions
diff --git a/deployments/.env b/deployments/.env new file mode 100644 index 00000000..c2630b85 --- /dev/null +++ b/deployments/.env @@ -0,0 +1,7 @@ +IMAGE_NAME=nexus3.onap.org:10003/onap/multicloud/k8s +CSAR_DIR=/opt/csar +KUBE_CONFIG_DIR=/opt/kubeconfig +DATABASE_TYPE=mongo +DATABASE_IP=172.19.0.2 +PLUGIN_IP=172.19.0.3 +PLUGINS_DIR=/opt/multicloud/k8s diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index a72bd096..c4faa537 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -16,24 +16,24 @@ services: image: ${IMAGE_NAME} networks: multicloud_net: - ipv4_address: 172.19.0.3 + ipv4_address: ${PLUGIN_IP} build: context: ./ args: - - HTTP_PROXY=$HTTP_PROXY - - HTTPS_PROXY=$HTTPS_PROXY - - NO_PROXY=$NO_PROXY + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTPS_PROXY} + - NO_PROXY=${NO_PROXY} ports: - "8081:8081" environment: - - CSAR_DIR=/opt/csar - - KUBE_CONFIG_DIR=/opt/kubeconfig - - DATABASE_TYPE=mongo - - 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 + - CSAR_DIR=${CSAR_DIR} + - KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR} + - DATABASE_TYPE=${DATABASE_TYPE} + - DATABASE_IP=${DATABASE_IP} + - PLUGINS_DIR=${PLUGINS_DIR} + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTPS_PROXY} + - NO_PROXY=${NO_PROXY},${DATABASE_IP} depends_on: - mongo links: @@ -45,11 +45,11 @@ services: image: mongo networks: multicloud_net: - ipv4_address: 172.19.0.2 + ipv4_address: ${DATABASE_IP} environment: - HTTP_PROXY: $HTTP_PROXY - HTTPS_PROXY: $HTTPS_PROXY - NO_PROXY: $NO_PROXY + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTPS_PROXY} + - NO_PROXY=${NO_PROXY} networks: multicloud_net: diff --git a/deployments/start.sh b/deployments/start.sh index d1b9f68a..233e0282 100755 --- a/deployments/start.sh +++ b/deployments/start.sh @@ -15,10 +15,7 @@ source /etc/environment k8s_path="$(git rev-parse --show-toplevel)" export GOPATH=$k8s_path -export IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/k8s" -export CSAR_DIR=/opt/csar -export KUBE_CONFIG_DIR=/opt/kubeconfig export DATABASE_TYPE=mongo export PLUGINS_DIR=$k8s_path/src/k8splugin/plugins |