Merge "[CDS] Add cps-data resourceSourceMapping in application.properties"

[oom.git] / kubernetes / so / components / so-openstack-adapter / values.yaml

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 16bbac2..28338cf 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -17,10 +17,6 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-  repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
-  envsubstImage: dibi/envsubst
   persistence:
     mountPath: /dockerdata-nfs
   security:
@@ -29,6 +25,14 @@ global:
   aaf:
     auth:
       encrypted: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
+  mariadbGalera:
+    serviceName: mariadb-galera
+    servicePort: '3306'
+
+readinessCheck:
+  wait_for:
+    jobs:
+      - '{{ include "common.release" . }}-so-mariadb-config-job'
 
 #################################################################
 # Secrets metaconfig
@@ -54,9 +58,8 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/openstack-adapter:1.6.4
+image: onap/so/openstack-adapter:1.10.0
 pullPolicy: Always
-repository: nexus3.onap.org:10001
 
 db:
   userName: so_user
@@ -92,7 +95,7 @@ service:
     type: ClusterIP
     internalPort: *containerPort
     externalPort: *containerPort
-    portName: so-optack-port
+    portName: http
 updateStrategy:
     type: RollingUpdate
     maxUnavailable: 1
@@ -147,6 +150,19 @@ config:
   openStackServiceTenantName: "service"
   openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
   openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
+  # "KEYSTONE" for keystone v2, "KEYSTONE_V3" for keystone v3
+  openStackKeystoneVersion: "KEYSTONE"
 nodeSelector: {}
 tolerations: []
 affinity: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-openstack-adapter
+  roles:
+    - read
+
+#Logs configuration
+log:
+  path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'