Code Review
/
appc
/
deployment.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
optimize size and time using "--no-cache-dir"
[appc/deployment.git]
/
installation
/
src
/
main
/
properties
/
appc.properties
diff --git
a/installation/src/main/properties/appc.properties
b/installation/src/main/properties/appc.properties
index
5229ef8
..
1dec948
100644
(file)
--- a/
installation/src/main/properties/appc.properties
+++ b/
installation/src/main/properties/appc.properties
@@
-33,7
+33,7
@@
appc.demo.threads.poolsize.max=2
appc.demo.provider.user=admin
appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider
appc.demo.provider.user=admin
appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider
-appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@10.0.2.1:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/s
ample-plugin:sample-plugin/pg-
streams/
+appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@10.0.2.1:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/s
tream-count:stream-count/
streams/
# The properties right below are needed to properly call the Master DG to serve demo purposes
appc.service.logic.module.name=APPC
# The properties right below are needed to properly call the Master DG to serve demo purposes
appc.service.logic.module.name=APPC
@@
-41,13
+41,13
@@
appc.topology.dg.method=topology-operation-all
appc.topology.dg.version=2.0.0
# TEMP - Properties that might be needed to make the AAI-APPC connection
appc.topology.dg.version=2.0.0
# TEMP - Properties that might be needed to make the AAI-APPC connection
-org.o
penecom
p.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl
-org.o
penecom
p.appc.db.user.appcctl=appcctl
-org.o
penecom
p.appc.db.pass.appcctl=appcctl
+org.o
na
p.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl
+org.o
na
p.appc.db.user.appcctl=appcctl
+org.o
na
p.appc.db.pass.appcctl=appcctl
-org.o
penecom
p.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl
-org.o
penecom
p.appc.db.user.sdnctl=sdnctl
-org.o
penecom
p.appc.db.pass.sdnctl=gamma
+org.o
na
p.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl
+org.o
na
p.appc.db.user.sdnctl=sdnctl
+org.o
na
p.appc.db.pass.sdnctl=gamma
### ###
### ###
@@
-57,6
+57,7
@@
provider1.type=OpenStackProvider
provider1.name=OpenStack
provider1.identity=http://localhost:8181/apidoc/explorer/index.html
provider1.tenant1.name=default
provider1.name=OpenStack
provider1.identity=http://localhost:8181/apidoc/explorer/index.html
provider1.tenant1.name=default
+provider1.tenant1.domain=Default
provider1.tenant1.userid=admin
provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
provider1.tenant1.userid=admin
provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
@@
-66,8
+67,8
@@
provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
### ###
### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ###
### ###
### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ###
-### which is what the Master HEAT Template to instantiate O
penECOM
P is pointing to (version R1). All other default values are ###
-### left there since these are pre-defined as part of APP-C/O
penECOM
P default instantiation with Master HEAT Template ###
+### which is what the Master HEAT Template to instantiate O
NA
P is pointing to (version R1). All other default values are ###
+### left there since these are pre-defined as part of APP-C/O
NA
P default instantiation with Master HEAT Template ###
### ###
### ###
@@
-81,9
+82,12
@@
appc.LCM.poolMembers=10.0.11.1:3904
appc.LCM.topic.read=APPC-LCM-READ
appc.LCM.topic.write=APPC-LCM-WRITE
appc.LCM.client.name=APPC-EVENT-LISTENER-TEST
appc.LCM.topic.read=APPC-LCM-READ
appc.LCM.topic.write=APPC-LCM-WRITE
appc.LCM.client.name=APPC-EVENT-LISTENER-TEST
+appc.LCM.client.key=
+appc.LCM.client.secret=
appc.LCM.provider.user=admin
appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
appc.LCM.provider.user=admin
appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
+appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm
+appc.LCM.scopeOverlap.endpoint=http://localhost:8181/restconf/operations/interfaces-service:execute-service
# properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle
poolMembers=10.0.11.1:3904
# properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle
poolMembers=10.0.11.1:3904
@@
-102,7
+106,7
@@
test.vmid=test
# Port 8774 below is default port for OpenStack's Nova API Service
test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999
#skips hypervisor check which usually occurs during iaas-adapter-bundle startup
# Port 8774 below is default port for OpenStack's Nova API Service
test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999
#skips hypervisor check which usually occurs during iaas-adapter-bundle startup
-org.o
penecom
p.appc.iaas.skiphypervisorcheck=true
+org.o
na
p.appc.iaas.skiphypervisorcheck=true
# Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle
# Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle
@@
-116,9
+120,9
@@
appc.sdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:conf
# Properties used by EventSenderDmaapImpl.java
DCAE.dmaap.event.topic.write=EventSenderTest
# Properties used by EventSenderDmaapImpl.java
DCAE.dmaap.event.topic.write=EventSenderTest
-DCAE.dmaap.
appc
.username=test
-DCAE.dmaap.
appc
.password=test
-DCAE.dmaap.event.pool
.m
embers=10.0.11.1:3904
+DCAE.dmaap.
event
.username=test
+DCAE.dmaap.
event
.password=test
+DCAE.dmaap.event.pool
M
embers=10.0.11.1:3904
# OAM Listener
appc.OAM.disabled=true
# OAM Listener
appc.OAM.disabled=true
@@
-130,3
+134,8
@@
appc.OAM.topic.write=testOAM
appc.OAM.client.name=testOAM
appc.OAM.provider.user=admin
appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
appc.OAM.client.name=testOAM
appc.OAM.provider.user=admin
appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+#Properties for communication between appc dmaap microservice and appc
+appc.srvcomm.messaging.username=appc
+appc.srvcomm.messaging.password=onapappc
+appc.srvcomm.messaging.url=http://localhost:8080/publish