diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-31 00:43:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-31 00:43:41 +0000 |
| commit | 007ad896428e3337e84098b236f195a6cbf7b2b2 (patch) | |
| tree | ba23e540e40e181163d273fe0edfc631b0806f1c | |
| parent | 06633269c37001194d595820ee7063109fe2f9e6 (diff) | |
| parent | a11a92a7e13889752b4f420d916c65b0dd31e9ad (diff) | |
Merge "Add dupliate ssl.key lines to aaiclient.prop file"
| -rw-r--r-- | kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties | 11 | ||||
| -rw-r--r-- | kubernetes/appc/values.yaml | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties index afd1e9569a..70285069ff 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties @@ -26,12 +26,13 @@ # # Certificate keystore and truststore # -org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/ccsdk/data/stores/truststore.onap.client.jks -org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin -org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true +org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/appc/data/stores/truststoreONAPall.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit +org.onap.ccsdk.sli.adaptors.aai.ssl.key=/opt/onap/appc/data/stores/truststoreONAPall.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=changeit -org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC -org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC +org.onap.ccsdk.sli.adaptors.aai.client.name=appc@appc.onap.org +org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456! org.onap.ccsdk.sli.adaptors.aai.application=openECOMP connection.timeout=60000 diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index d37f50b59e..324315fc36 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -31,7 +31,7 @@ global: flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-image:1.4.0 +image: onap/appc-image:1.4.1-SNAPSHOT-latest pullPolicy: Always # flag to enable debugging - application support required @@ -39,8 +39,6 @@ debugEnabled: false # application configuration config: - aafExtIP: 127.0.0.1 - aafExtFQDN: aaf-onap-beijing-test.osaaf.org ansibleServiceName: appc-ansible-server ansiblePort: 8000 mariadbRootPassword: secretpassword @@ -49,8 +47,8 @@ config: mysqlDatabase: my-database mariadbGaleraSVCName: appc-dbhost mariadbGaleraContName: appc-db - enableAAF: false - enableClustering: true + enableAAF: true + enableClustering: false configDir: /opt/onap/appc/data/properties dmaapTopic: SUCCESS logstashServiceName: log-ls |