diff options
| author |   Aaron Hay <aaron.hay@att.com> | 2018-10-29 14:17:02 -0400 |
|---|---|---|
| committer | Aaron Hay <aaron.hay@att.com> | 2018-10-30 18:20:16 -0400 |
| commit | a11a92a7e13889752b4f420d916c65b0dd31e9ad (patch) | |
| tree | 6e06a87e40606a5c96145bd5c69e5c027e87bc4f | |
| parent | 73f4a744301e68f6e3942649630ab56cd297c82b (diff) | |
Add dupliate ssl.key lines to aaiclient.prop file
Update image version.
Enable AAF by default.
Remove AAF lines from values.yaml file that are no longer necessary based on AAF enhancements that have been made for this release.
Add ssl.key lines to aaiclient.properties file.
Change-Id: I4ad9bd204ad1fb7def972b78a4881e7e134ddfce
Issue-ID: APPC-1218
Signed-off-by: Aaron Hay <aaron.hay@att.com>
| -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 |