summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
0d2cf1a)
In case of "localCluster: true" the cassandra chart will be added
in sdc-cs subchart. Renamed global section to sdc-cassandra.
Additionally serviceAccount is added to
cassandra definition in sdc-cs (see OOM-2905)
Issue-ID: OOM-2899
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Id943db249a3abd9dbc67e333a05f6c2abd84a810
global:
nodePortPrefix: 302
aafEnabled: true
global:
nodePortPrefix: 302
aafEnabled: true
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
- name: serviceAccount
version: ~10.x-0
repository: '@local'
- name: serviceAccount
version: ~10.x-0
repository: '@local'
+ - name: cassandra
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ condition: global.sdc_cassandra.localCluster
+
- /app/ready.py
args:
- --container-name
- /app/ready.py
args:
- --container-name
- {{- if .Values.global.cassandra.localCluster }}
+ {{- if .Values.global.sdc_cassandra.localCluster }}
- sdc-cs
{{- else }}
- cassandra
- sdc-cs
{{- else }}
- cassandra
readinessImage: onap/oom/readiness:3.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
readinessImage: onap/oom/readiness:3.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
#################################################################
# Application configuration defaults.
#################################################################
#################################################################
# Application configuration defaults.
#################################################################
+
+#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
+cassandra:
+ nameOverride: sdc-cs
+ replicaCount: 3
+ service:
+ name: sdc-cs
+ serviceAccount:
+ nameOverride: sdc-cs
+ persistence:
+ mountSubPath: sdc/sdc-cs/CS
+ enabled: true
+
# application image
repository: nexus3.onap.org:10001
image: onap/sdc-cassandra:1.9.5
# application image
repository: nexus3.onap.org:10001
image: onap/sdc-cassandra:1.9.5
valueFrom:
secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
- name: CS_HOST_IP
valueFrom:
secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
- name: CS_HOST_IP
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
resources:
limits:
cpu: 800m
resources:
limits:
cpu: 800m
nodePortPrefix: 302
aafEnabled: true
persistence: {}
nodePortPrefix: 302
aafEnabled: true
persistence: {}
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
- name: JAVA_OPTIONS
value: {{ .Values.config.javaOptions }}
- name: CS_HOSTS
- name: JAVA_OPTIONS
value: {{ .Values.config.javaOptions }}
- name: CS_HOSTS
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
global:
nodePortPrefix: 302
aafEnabled: true
global:
nodePortPrefix: 302
aafEnabled: true
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
"default_attributes": {
"disableHttp": {{ .Values.global.security.disableHttp }},
"default_attributes": {
"disableHttp": {{ .Values.global.security.disableHttp }},
- "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+ "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
"FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
"FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
- "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
+ "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
],
"BE": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
],
"BE": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
"cassandra_user": "asdc_user",
"cassandra_password": "Aa1234%^!",
"concurrent_writes": "32",
"cassandra_user": "asdc_user",
"cassandra_password": "Aa1234%^!",
"concurrent_writes": "32",
- "cluster_name": "{{.Values.global.cassandra.clusterName}}",
- "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
+ "cluster_name": "{{.Values.global.sdc_cassandra.clusterName}}",
+ "datacenter_name": "{{.Values.global.sdc_cassandra.dataCenter}}",
"multithreaded_compaction": "false",
"cache_dir": "/var/lib/cassandra/saved_caches",
"log_file": "/var/lib/cassandra/log/system.log",
"multithreaded_compaction": "false",
"cache_dir": "/var/lib/cassandra/saved_caches",
"log_file": "/var/lib/cassandra/log/system.log",
"socket_read_timeout": "20000",
"socket_connect_timeout": "20000",
"janusgraph_connection_timeout": "10000",
"socket_read_timeout": "20000",
"socket_connect_timeout": "20000",
"janusgraph_connection_timeout": "10000",
- "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
- "db_cache": "{{.Values.global.cassandra.dbCache}}",
- "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
- "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
+ "replication_factor": "{{.Values.global.sdc_cassandra.replicaCount}}",
+ "db_cache": "{{.Values.global.sdc_cassandra.dbCache}}",
+ "read_consistency_level": "{{.Values.global.sdc_cassandra.readConsistencyLevel}}",
+ "write_consistency_level":"{{.Values.global.sdc_cassandra.writeConsistencyLevel}}"
},
"DMAAP": {
"consumer": {
},
"DMAAP": {
"consumer": {
keystore_password: PyhrUCFZdXIhWyohWTUhRV5mKFpLYzMx
wf_external_user_password: S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
aafEnabled: true
keystore_password: PyhrUCFZdXIhWyohWTUhRV5mKFpLYzMx
wf_external_user_password: S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
aafEnabled: true
#This flag allows SDC to instantiate its own cluster, serviceName
#This flag allows SDC to instantiate its own cluster, serviceName
- #should be sdc-cs if this flag is enabled
+ #should be "sdc-cs" if this flag is enabled
localCluster: false
#The cassandra service name to connect to (default: shared cassandra service)
serviceName: cassandra
#Shared cassandra cluster replicaCount, should be changed if localCluster is enabled
#to match with its own cluster replica
localCluster: false
#The cassandra service name to connect to (default: shared cassandra service)
serviceName: cassandra
#Shared cassandra cluster replicaCount, should be changed if localCluster is enabled
#to match with its own cluster replica
+ #see "cassandra: replicaCount" in file sdc-cs/values.yaml)
replicaCount: 3
dbCache: true
readConsistencyLevel: ONE
replicaCount: 3
dbCache: true
readConsistencyLevel: ONE
workflowUrl: 10.0.2.15
vnfRepoPort: 8703
workflowUrl: 10.0.2.15
vnfRepoPort: 8703
-#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
-cassandra:
- nameOverride: sdc-cs
- replicaCount: 1
- service:
- name: sdc-cs
- persistence:
- mountSubPath: sdc/sdc-cs/CS
- enabled: true
-
# dependency / sub-chart configuration
sdc-wfd:
enabled: true
# dependency / sub-chart configuration
sdc-wfd:
enabled: true