Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "VID MSO client - enable HTTPS"
[oom.git]
/
kubernetes
/
policy
/
charts
/
drools
/
resources
/
config
/
opt
/
policy
/
config
/
drools
/
base.conf
diff --git
a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
index
127a483
..
6962f9d
100644
(file)
--- a/
kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
+++ b/
kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/base.conf
@@
-1,4
+1,4
@@
-# Copyright © 2017 Amdocs, Bell Canada, AT&T
+# Copyright © 2017
-2018
Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-15,9
+15,10
@@
# SYSTEM software configuration
POLICY_HOME=/opt/app/policy
# SYSTEM software configuration
POLICY_HOME=/opt/app/policy
-POLICY_LOGS=/var/log/
ONAP/policy
+POLICY_LOGS=/var/log/
onap/policy/pdpd
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-KEYSTORE_PASSWD=PolicyR0ck$
+KEYSTORE_PASSWD=Pol1cy_0nap
+TRUSTSTORE_PASSWD=Pol1cy_0nap
# Telemetry credentials
# Telemetry credentials
@@
-29,22
+30,22
@@
ENGINE_MANAGEMENT_PASSWORD=31nst31n
# nexus repository
snapshotRepositoryID=policy-nexus-snapshots
# nexus repository
snapshotRepositoryID=policy-nexus-snapshots
-snapshotRepositoryUrl=http://{{.
Release.Name}}-{{.
Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/snapshots/
+snapshotRepositoryUrl=http://{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/snapshots/
releaseRepositoryID=policy-nexus-releases
releaseRepositoryID=policy-nexus-releases
-releaseRepositoryUrl=http://{{.
Release.Name}}-{{.
Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/releases/
+releaseRepositoryUrl=http://{{.Values.global.nexus.nameOverride}}:{{.Values.config.nexusPort}}/nexus/content/repositories/releases/
repositoryUsername=admin
repositoryPassword=admin123
# Relational (SQL) DB access
repositoryUsername=admin
repositoryPassword=admin123
# Relational (SQL) DB access
-SQL_HOST={{.
Release.Name}}-{{.
Values.global.mariadb.nameOverride}}
+SQL_HOST={{.Values.global.mariadb.nameOverride}}
SQL_USER=policy_user
SQL_PASSWORD=policy_user
# PDP-D DMaaP configuration channel
PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION
SQL_USER=policy_user
SQL_PASSWORD=policy_user
# PDP-D DMaaP configuration channel
PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION
-PDPD_CONFIGURATION_SERVERS=
dmaap
+PDPD_CONFIGURATION_SERVERS=
message-router
PDPD_CONFIGURATION_API_KEY=
PDPD_CONFIGURATION_API_SECRET=
PDPD_CONFIGURATION_CONSUMER_GROUP=
PDPD_CONFIGURATION_API_KEY=
PDPD_CONFIGURATION_API_SECRET=
PDPD_CONFIGURATION_CONSUMER_GROUP=
@@
-53,13
+54,13
@@
PDPD_CONFIGURATION_PARTITION_KEY=
# PAP
# PAP
-PAP_HOST={{.
Release.Name}}-{{.
Values.global.pap.nameOverride}}
+PAP_HOST={{.Values.global.pap.nameOverride}}
PAP_USERNAME=testpap
PAP_PASSWORD=alpha123
# PDP-X
PAP_USERNAME=testpap
PAP_PASSWORD=alpha123
# PDP-X
-PDP_HOST={{.
Release.Name}}-{{.
Values.global.pdp.nameOverride}}
+PDP_HOST={{.Values.global.pdp.nameOverride}}
PDP_USERNAME=testpdp
PDP_PASSWORD=alpha123
PDP_CLIENT_USERNAME=python
PDP_USERNAME=testpdp
PDP_PASSWORD=alpha123
PDP_CLIENT_USERNAME=python
@@
-69,21
+70,22
@@
PDP_ENVIRONMENT=TEST
# DCAE DMaaP
DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT
# DCAE DMaaP
DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT
-DCAE_SERVERS=dmaap
+DCAE_SERVERS=message-router
+DCAE_CONSUMER_GROUP=dcae.policy.shared
# Open DMaaP
# Open DMaaP
-DMAAP_SERVERS=
dmaap
+DMAAP_SERVERS=
message-router
# AAI
# AAI
-AAI_URL=https://aai.
api.simpledemo.openecomp.org
:8443
+AAI_URL=https://aai.
{{.Release.Namespace}}
:8443
AAI_USERNAME=POLICY
AAI_PASSWORD=POLICY
# MSO
AAI_USERNAME=POLICY
AAI_PASSWORD=POLICY
# MSO
-SO_URL=http://
mso
:8080/ecomp/mso/infra
+SO_URL=http://
so.{{.Release.Namespace}}
:8080/ecomp/mso/infra
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$