Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DCAEMOD] Uses new tpls for repos / images"
[oom.git]
/
kubernetes
/
nbi
/
values.yaml
diff --git
a/kubernetes/nbi/values.yaml
b/kubernetes/nbi/values.yaml
index
82334be
..
61d7680
100644
(file)
--- a/
kubernetes/nbi/values.yaml
+++ b/
kubernetes/nbi/values.yaml
@@
-18,10
+18,6
@@
#################################################################
global:
nodePortPrefix: 302
#################################################################
global:
nodePortPrefix: 302
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.2
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
mariadbGalera: &mariadbGalera
#This flag allows SO to instantiate its own mariadb-galera cluster
localCluster: false
mariadbGalera: &mariadbGalera
#This flag allows SO to instantiate its own mariadb-galera cluster
localCluster: false
@@
-29,8
+25,6
@@
global:
internalPort: 3306
nameOverride: mariadb-galera
aafEnabled: true
internalPort: 3306
nameOverride: mariadb-galera
aafEnabled: true
- busyBoxImage: busybox:1.30
- busyBoxRepository: docker.io
#################################################################
# AAF part
#################################################################
# AAF part
@@
-72,7
+66,7
@@
subChartsOnly:
# application image
repository: nexus3.onap.org:10001
# application image
repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:
6.0.3
+image: onap/externalapi/nbi:
7.0.2
pullPolicy: IfNotPresent
sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
aai_authorization: Basic QUFJOkFBSQ==
pullPolicy: IfNotPresent
sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
aai_authorization: Basic QUFJOkFBSQ==
@@
-84,6
+78,8
@@
config:
logstashServiceName: log-ls
logstashPort: 5044
cloudOwner: CloudOwner
logstashServiceName: log-ls
logstashPort: 5044
cloudOwner: CloudOwner
+ k8sCloudRegionId: k8sregionfour
+ k8sCloudOwner: k8scloudowner4
ecompInstanceId: OOM
openStackRegion: RegionOne
openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
ecompInstanceId: OOM
openStackRegion: RegionOne
openStackVNFTenantId: 31047205ce114b60833b23e400d6a535