summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAaron Hay <aaron.hay@att.com>2018-11-13 00:34:05 -0500
committerAaron Hay <aaron.hay@att.com>2018-11-13 00:42:21 -0500
commitd46d63fbf48d035329dd276cad7114d6bde47082 (patch)
tree7ffff3caa6077622ca3a0b4339bcdd2ae78fa924 /kubernetes
parentefb02b5f1c0a9be4719e3886018ce024395c27ba (diff)
Update APPC charts for Casablanca AAF support
Change-Id: I086c16c652a9b3bb7c147e720a31da17ff33f6a5 Issue-ID: APPC-1235 Signed-off-by: Aaron Hay <aaron.hay@att.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties2
-rw-r--r--kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties1
-rw-r--r--kubernetes/appc/values.yaml6
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: