diff options
| -rwxr-xr-x[-rw-r--r--] | kubernetes/onap/requirements.yaml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | kubernetes/onap/values.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 6 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 1d1dd8b7a5..5dd51a006b 100644..100755 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -148,3 +148,7 @@ dependencies: version: ~5.x-0 repository: '@local' condition: modeling.enabled + - name: nginx-ingress + version: ~1.6.18 + repository: 'https://kubernetes-charts.storage.googleapis.com' + condition: nginx-ingress.enabled diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index c0095049b5..46c8db6e5e 100644..100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -168,3 +168,5 @@ vnfsdk: enabled: false modeling: enabled: false +nginx-ingress: + enabled: false diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index ade2e72dc2..b2fa288fff 100644 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -79,7 +79,7 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantId GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}' GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}' GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}' -GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public' +GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = '{{ .Values.openStackPublicNetworkName }}' GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}' GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}" GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}" @@ -181,7 +181,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}', "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}', - "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public', + "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : '{{ .Values.openStackPublicNetworkName }}', "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}', "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}", "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}", @@ -221,4 +221,4 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_VM_FLAVOR" : '{{ .Values.openStackFlavourMedium }}', "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : 'refrepo.{{include "common.namespace" .}}' -}
\ No newline at end of file +} diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 16ca1d9360..cb10e384af 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -80,6 +80,7 @@ openStackUserDomain: "Default" # UUID of the Openstack network that can assign floating ips. Maps to GLOBAL_INJECTED_PUBLIC_NET_ID openStackPublicNetId: "e8f51958045716781ffc" +openStackPublicNetworkName: "public" # password for Openstack tenant where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PASSWORD openStackPassword: "tenantPassword" # Openstack region. Maps to GLOBAL_INJECTED_REGION |