diff options
9 files changed, 23 insertions, 5 deletions
diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index ffc5e236ca..9217d2cd68 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x echo "Validating onap-parameters.yaml has been populated" [[ -z "$OPENSTACK_UBUNTU_14_IMAGE" ]] && { echo "Error: OPENSTACK_UBUNTU_14_IMAGE must be set in onap-parameters.yaml"; exit 1; } @@ -7,6 +7,7 @@ echo "Validating onap-parameters.yaml has been populated" [[ -z "$OPENSTACK_OAM_SUBNET_ID" ]] && { echo "Error: OPENSTACK_OAM_SUBNET_ID must be set in onap-parameters.yaml"; exit 1; } [[ -z "$OPENSTACK_OAM_NETWORK_CIDR" ]] && { echo "Error: OPENSTACK_OAM_NETWORK_CIDR must be set in onap-parameters.yaml"; exit 1; } [[ -z "$OPENSTACK_USERNAME" ]] && { echo "Error: OPENSTACK_USERNAME must be set in onap-parameters.yaml"; exit 1; } +[[ -z "$OPENSTACK_TENANT_ID" ]] && { echo "Error: OPENSTACK_TENANT_ID must be set in onap-parameters.yaml"; exit 1; } [[ -z "$OPENSTACK_API_KEY" ]] && { echo "Error: OPENSTACK_API_KEY must be set in onap-parameters.yaml"; exit 1; } [[ -z "$OPENSTACK_REGION" ]] && { echo "Error: OPENSTACK_REGION must be set in onap-parameters.yaml"; exit 1; } [[ -z "$OPENSTACK_KEYSTONE_URL" ]] && { echo "Error: OPENSTACK_KEYSTONE_URL must be set in onap-parameters.yaml"; exit 1; } @@ -85,6 +86,8 @@ find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s,NETWORK_CIDR_WITH_ONAP_ find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_USERNAME_HERE/$OPENSTACK_USERNAME/g" {} \; +find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_TENANT_ID_HERE/$OPENSTACK_TENANT_ID/g" {} \; + find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_PASSWORD_HERE/$OPENSTACK_API_KEY/g" {} \; find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_REGION_HERE/$OPENSTACK_REGION/g" {} \; diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py index bc9d07c448..d0ef25623c 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py @@ -12,12 +12,13 @@ GLOBAL_INJECTED_GERRIT_BRANCH = "master" GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso" -GLOBAL_INJECTED_NETWORK = "OPENSTACK_OAM_NETWORK_ID_HERE" +GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE" GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" GLOBAL_INJECTED_NEXUS_USERNAME = "docker" GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" +GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy" GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy" diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml index 3a74beddbb..081bc9d87b 100644 --- a/kubernetes/config/onap-parameters-sample.yaml +++ b/kubernetes/config/onap-parameters-sample.yaml @@ -6,6 +6,7 @@ OPENSTACK_OAM_NETWORK_CIDR: "192.168.30.0/24" OPENSTACK_USERNAME: "vnf_user" OPENSTACK_API_KEY: "vnf_password" OPENSTACK_TENANT_NAME: "vnfs" +OPENSTACK_TENANT_ID: "47899782ed714295b1151681fdfd51f5" OPENSTACK_REGION: "RegionOne" OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000" OPENSTACK_FLAVOUR_MEDIUM: "m1.medium" diff --git a/kubernetes/config/onap-parameters.yaml b/kubernetes/config/onap-parameters.yaml index 7ddaf4d4c3..6f84d0f354 100644 --- a/kubernetes/config/onap-parameters.yaml +++ b/kubernetes/config/onap-parameters.yaml @@ -6,6 +6,7 @@ OPENSTACK_OAM_NETWORK_CIDR: "" OPENSTACK_USERNAME: "" OPENSTACK_API_KEY: "" OPENSTACK_TENANT_NAME: "" +OPENSTACK_TENANT_ID: "" OPENSTACK_REGION: "" OPENSTACK_KEYSTONE_URL: "" OPENSTACK_FLAVOUR_MEDIUM: "" diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index 3f82e33a72..35fba560c0 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -17,7 +17,7 @@ spec: hostname: msb-iag containers: - args: - image: nexus3.onap.org:10001/onap/msb/msb_apigateway + image: {{ .Values.image.apigateway }} name: "msb-iag" env: - name: CONSUL_IP diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index 01f1696adc..a63dace7de 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -3,7 +3,7 @@ pullPolicy: IfNotPresent image: consul: consul:latest discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest - apigateway: nexus3.onap.org:10001/onap/msb/msb_discovery:latest + apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:latest consulPort: 8500 consulNodePort: 30500 @@ -20,4 +20,4 @@ iagReplicas: 1 eagPort: 80 eagNodePort: 30082 -eagReplicas: 1
\ No newline at end of file +eagReplicas: 1 diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml index f97252af82..ad1dac8077 100644 --- a/kubernetes/multicloud/templates/framework-deployment.yaml +++ b/kubernetes/multicloud/templates/framework-deployment.yaml @@ -16,6 +16,10 @@ spec: hostname: framework containers: - env: + - name: MSB_ADDR + value: "{{ .Values.msbgateway }}" + _ name: MSB_PORT + value: "{{ .Values.msbPort }}" - name: AAI_ADDR value: aai-service.{{ .Values.nsPrefix }}-aai - name: AAI_PORT diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml index 5da4f6303e..85a43a10db 100644 --- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml @@ -16,6 +16,10 @@ spec: hostname: multicloud-vio containers: - env: + - name: MSB_ADDR + value: "{{ .Values.msbgateway }}" + - name: MSB_PORT + value: "{{ .Values.msbPort }}" - name: AAI_ADDR value: aai-service.{{ .Values.nsPrefix }}-aai - name: AAI_PORT diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml index 26f9592a81..2cbb3771e7 100644 --- a/kubernetes/multicloud/values.yaml +++ b/kubernetes/multicloud/values.yaml @@ -5,3 +5,7 @@ image: readiness: oomk8s/readiness-check:1.0.0 framework: nexus3.onap.org:10001/onap/multicloud/framework:latest vio: nexus3.onap.org:10001/onap/multicloud/vio:latest + +# domain name of msb gateway +msbgateway: msb-iag.onap-msb +msbPort: 80
\ No newline at end of file |