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 "[DCAE] Version updates for Kohn"
[oom.git]
/
kubernetes
/
vfc
/
values.yaml
diff --git
a/kubernetes/vfc/values.yaml
b/kubernetes/vfc/values.yaml
index
b204c58
..
a0b69e0
100644
(file)
--- a/
kubernetes/vfc/values.yaml
+++ b/
kubernetes/vfc/values.yaml
@@
-15,7
+15,7
@@
global:
config:
ssl_enabled: false
global:
config:
ssl_enabled: false
- msbprotocol: http
s
+ msbprotocol: http
msbServiceName: msb-iag
msbPort: 443
redisServiceName: vfc-redis
msbServiceName: msb-iag
msbPort: 443
redisServiceName: vfc-redis
@@
-26,61
+26,78
@@
global:
# we use this flag to determine who is responbile for serice registeration
# and it can reduce duplicate registration.
reg_to_msb_when_start: False
# we use this flag to determine who is responbile for serice registeration
# and it can reduce duplicate registration.
reg_to_msb_when_start: False
- mariadb_admin: root
+ mariadb_admin:
&mariadbAdmin
root
persistence:
mountPath: /dockerdata-nfs
persistence:
mountPath: /dockerdata-nfs
+ mariadbGalera: &mariadbGalera
+ #This flag allows VFC to instantiate its own mariadb-galera cluster
+ localCluster: false
+ service: mariadb-galera
+ internalPort: 3306
+ nameOverride: mariadb-galera
+ centralizedLoggingEnabled: true
#################################################################
# Secrets metaconfig
#################################################################
secrets:
#################################################################
# Secrets metaconfig
#################################################################
secrets:
- - uid:
"db-root-pass"
+ - uid:
db-root-pass
name: &dbRootPassSecret '{{ include "common.release" . }}-vfc-db-root-pass'
name: &dbRootPassSecret '{{ include "common.release" . }}-vfc-db-root-pass'
+ externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .) (hasSuffix "db-root-pass" (index .Values "mariadb-galera" "rootUser" "externalSecret"))}}'
+ login: '{{ index .Values "mariadb-galera" "rootUser" "user" }}'
+ password: '{{ index .Values "mariadb-galera" "rootUser" "password" }}'
type: password
type: password
- password: '{{ .Values.config.mariadbRootPassword }}'
# application configuration
config:
logstashServiceName: log-ls
logstashPort: 5044
# application configuration
config:
logstashServiceName: log-ls
logstashPort: 5044
-mariadb-galera:
- config:
- mariadbRootPasswordExternalSecret: *dbRootPassSecret
- nameOverride: vfc-mariadb
- service:
- name: vfc-mariadb
- portName: vfc-mariadb
+mariadb-galera: &localMariadb
+ rootUser:
+ user: *mariadbAdmin
+ # password:
+ externalSecret: *dbRootPassSecret
+ nameOverride: &dbServer vfc-mariadb
nfsprovisionerPrefix: vfc
persistence:
mountSubPath: vfc/data
enabled: true
disableNfsProvisioner: true
nfsprovisionerPrefix: vfc
persistence:
mountSubPath: vfc/data
enabled: true
disableNfsProvisioner: true
+ serviceAccount:
+ nameOverride: *dbServer
+ replicaCount: 1
-db: &dbConfig
- mariadbService: vfc-mariadb
- mariadbPort: 3306
- mariadbRootPasswordExternalSecret: *dbRootPassSecret
+vfc-generic-vnfm-driver:
+ enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
-vfc-
catalog
:
- config:
- << : *dbConfig
+vfc-
huawei-vnfm-driver
:
+ enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-nslcm:
vfc-nslcm:
- config:
- << : *dbConfig
+ enabled: true
+ mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
+
+vfc-redis:
+ enabled: true
vfc-vnflcm:
vfc-vnflcm:
- config:
- << : *dbConfig
+ enabled: true
+ mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-vnfmgr:
vfc-vnfmgr:
- config:
- << : *dbConfig
+ enabled: true
+ mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
vfc-vnfres:
vfc-vnfres:
- config:
- << : *dbConfig
+ enabled: true
+ mariadb-galera: *localMariadb
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
# sub-chart configuration
vfc-workflow:
# sub-chart configuration
vfc-workflow:
@@
-90,3
+107,7
@@
vfc-workflow:
vfc-workflow-engine:
config:
workflowPort: 10550
vfc-workflow-engine:
config:
workflowPort: 10550
+
+vfc-zte-vnfm-driver:
+ enabled: true
+ logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'