diff options
| author |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-07-16 13:57:53 +0000 |
|---|---|---|
| committer | Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-07-16 14:02:39 +0000 |
| commit | 96a1b549c7de9497cb3543ed8d3331230844db9c (patch) | |
| tree | 0c044ebe6b7a10df6cb7b62ff1e3a0c871b1c599 /patches/onap.patch | |
| parent | ac20a622520d1126de2c09b355aaba610f374bcc (diff) | |
Adding public network config capability to oom
This change was implemented in El-Alto, I see no chance
in getting into OOM dublin branch therefore suggesting
adding it into our patch file. Its required for
automatic vFWCL test execution.
Issue-ID: TEST-166
Change-Id: I19678ae6df3f4ec0fae541c33187db256efea66b
Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
Diffstat (limited to 'patches/onap.patch')
| -rw-r--r-- | patches/onap.patch | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/patches/onap.patch b/patches/onap.patch index a135ad38..2a40a2a1 100644 --- a/patches/onap.patch +++ b/patches/onap.patch @@ -25,7 +25,6 @@ index b26f6dd..2d31aad 100644 - command: - /root/ready.py -- - diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml index 353c231..cf38409 100644 --- a/kubernetes/common/dgbuilder/templates/deployment.yaml @@ -46,5 +45,26 @@ index 353c231..cf38409 100644 - containerPort: {{ .Values.service.internalPort }} readinessProbe: -- +diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +index e46b5fc..d61e563 100644 +--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py ++++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +@@ -74,6 +74,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 = '{{ .Values.openStackPublicNetworkName }}' + GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}' + GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = 'drools.{{include "common.namespace" .}}' + GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}' +@@ -165,6 +166,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" : '{{ .Values.openStackPublicNetworkName }}', + "GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}', + "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : 'drools.{{include "common.namespace" .}}', + "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}', +-- 1.8.3.1 |