diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-11-13 19:46:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-13 19:46:42 +0000 |
| commit | 460e28cbf478ac6df05056cd05bc60468fcf2745 (patch) | |
| tree | 7d4669a9aa9334c58918a4600ce2b918ccf67520 /kubernetes | |
| parent | e1887cc67ba5b0cccaab57c5959f2ffe958ee734 (diff) | |
| parent | d46d63fbf48d035329dd276cad7114d6bde47082 (diff) | |
Merge "Update APPC charts for Casablanca AAF support"
Diffstat (limited to 'kubernetes')
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties index 8553fcda02..d0a237acc8 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties @@ -34,7 +34,7 @@ appc.demo.threads.poolsize.max=2 appc.demo.provider.user={{.Values.config.odlUser}} appc.demo.provider.pass={{.Values.config.odlPassword}} appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider -appc.provider.vfodl.url=http://{{.Values.config.odlUser}}:{{.Values.config.odlPassword}}@{{.Values.service.name}}:{{.Values.service.externalPort}}/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ +appc.provider.vfodl.url=http://{{.Values.config.odlUser|urlquery}}:{{.Values.config.odlPassword|urlquery}}@{{.Values.service.name}}:{{.Values.service.externalPort}}/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ # The properties right below are needed to properly call the Master DG to serve demo purposes appc.service.logic.module.name=APPC diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties index 7ce85c388e..91ab8ff3ed 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties @@ -20,6 +20,7 @@ #hostname=localhost cadi_loglevel=INFO +cadi_bath_convert=/opt/onap/appc/data/properties/bath_config.csv ############################################################ # Properties Generated by AT&T Certificate Manager diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index d6719c1e37..1b1c944315 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 @@ -53,7 +53,7 @@ config: dmaapTopic: SUCCESS logstashServiceName: log-ls logstashPort: 5044 - odlPassword: demo123456! + odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U openStackType: OpenStackProvider openStackName: OpenStack openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html @@ -61,7 +61,7 @@ config: openStackDomain: default openStackUserName: admin openStackEncryptedPassword: admin - odlUser: appc@appc.onap.org + odlUser: admin appc-ansible-server: service: |