diff options
Diffstat (limited to 'components/aai-graphadmin')
-rw-r--r-- | components/aai-graphadmin/resources/config/application.properties | 14 | ||||
-rw-r--r-- | components/aai-graphadmin/values.yaml | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/components/aai-graphadmin/resources/config/application.properties b/components/aai-graphadmin/resources/config/application.properties index 7ff65c9..7cc354a 100644 --- a/components/aai-graphadmin/resources/config/application.properties +++ b/components/aai-graphadmin/resources/config/application.properties @@ -26,7 +26,9 @@ info.build.version=1.2.0 spring.application.name=aai-graphadmin spring.jersey.type=filter -server.contextPath=/ +spring.main.allow-bean-definition-overriding=true +server.servlet.context-path=/ + spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration spring.profiles.active={{ .Values.config.profiles.active }} @@ -97,3 +99,13 @@ schema.service.ssl.key-store=${server.local.startpath}/etc/auth/{{ .Values.globa schema.service.ssl.trust-store=${server.local.startpath}/etc/auth/{{ .Values.global.config.truststore.filename }} schema.service.ssl.key-store-password=password({{ .Values.global.config.keystore.passwd }}) schema.service.ssl.trust-store-password=password({{ .Values.global.config.truststore.passwd }}) + +aperture.rdbmsname=aai_relational + +aperture.service.client={{ .Values.global.config.schema.service.client }} +aperture.service.base.url=http://localhost:8457/aai/aperture +aperture.service.ssl.key-store=${server.local.startpath}etc/auth/{{ .Values.global.config.keystore.filename }} +aperture.service.ssl.trust-store=${server.local.startpath}etc/auth/{{ .Values.global.config.truststore.filename }} +aperture.service.ssl.key-store-password=password({{ .Values.global.config.keystore.passwd }}) +aperture.service.ssl.trust-store-password=password({{ .Values.global.config.truststore.passwd }}) +aperture.service.timeout-in-milliseconds=300000 diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml index b5519d2..e4f4fac 100644 --- a/components/aai-graphadmin/values.yaml +++ b/components/aai-graphadmin/values.yaml @@ -28,10 +28,11 @@ global: # global defaults # application image repository: nexus3.onap.org:10001 -image: onap/aai-graphadmin:1.6.3 +image: onap/aai-graphadmin:1.7.0 pullPolicy: Always restartPolicy: Always flavor: small +flavorOverride: small # default number of instances replicaCount: 1 |