Change to openstack conn properties

[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 aa6ba61..b2d4e1c 100644 (file)
--- a/installation/src/main/properties/appc.properties
+++ b/installation/src/main/properties/appc.properties
@@ -40,19 +40,25 @@ appc.service.logic.module.name=APPC
 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
+org.openecomp.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl
+org.openecomp.appc.db.user.appcctl=appcctl
+org.openecomp.appc.db.pass.appcctl=appcctl
 
-
+org.openecomp.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl
+org.openecomp.appc.db.user.sdnctl=sdnctl
+org.openecomp.appc.db.pass.sdnctl=gamma
 
 
 ###                                                                                                                                               ###
 ### OpenStack credentials (these properties also are used in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) ###
 ###                                                                                                                                               ###
-provider1.type=test
-provider1.name=test
-provider1.identity=http://identity1.appc.local/test
-provider1.tenant1.name=test
-provider1.tenant1.userid=test
-provider1.tenant1.password=test
+provider1.type=OpenStackProvider
+provider1.name=OpenStack
+provider1.identity=http://localhost:8181/apidoc/explorer/index.html
+provider1.tenant1.name=default
+provider1.tenant1.userid=admin
+provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 
 
@@ -98,13 +104,13 @@ test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999
 
 
 # Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle 
-appc.asdc.host=10.0.3.1:8443
-appc.asdc.env=APPC-ASDC-ENV
-appc.asdc.user=test
-appc.asdc.pass=test
-appc.asdc.consumer=APPC-ASDC-CONSUMER
-appc.asdc.consumer.id=APPC-ASDC-CONSUMER-ID
-appc.asdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request
+appc.sdc.host=10.0.3.1:8443
+appc.sdc.env=APPC-ASDC-ENV
+appc.sdc.user=test
+appc.sdc.pass=test
+appc.sdc.consumer=APPC-ASDC-CONSUMER
+appc.sdc.consumer.id=APPC-ASDC-CONSUMER-ID
+appc.sdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request
 
 # Properties used by EventSenderDmaapImpl.java
 DCAE.dmaap.event.topic.write=EventSenderTest
@@ -112,7 +118,7 @@ DCAE.dmaap.appc.username=test
 DCAE.dmaap.appc.password=test
 DCAE.dmaap.event.pool.members=10.0.11.1:3904
 
-#OAM Listener
+# OAM Listener
 appc.OAM.disabled=true
 appc.OAM.provider.url=http://localhost:8181/restconf/operations/appc-oam
 appc.OAM.poolMembers=10.0.11.1:3904