aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-core/distribution/catalog-standalone
diff options
context:
space:
mode:
authorJian Huang <huang.jian12@zte.com.cn>2016-09-21 00:34:06 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-09-21 00:34:06 +0000
commit280fc10f04b34f7046ec38cd7baab877a12369d2 (patch)
tree090d850470a9558782e3914df04b3caec8f16ade /catalog-core/distribution/catalog-standalone
parent368219ed3caa2a2de7d92a7f45626e9d37529b7e (diff)
parent57699dfe08e82a7a045027d4fd4a201c8ad79428 (diff)
Merge "Delete the redundant Configuration Items. Such as opentoscaServerAddr, yamlParseAddr, ariaParserAddr, wso2HostIp, wso2HostPort, ldapServerIp, ldapServerPort, ldapLogindn, ldapPassword, ldapVersion."
Diffstat (limited to 'catalog-core/distribution/catalog-standalone')
-rw-r--r--catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml16
1 files changed, 0 insertions, 16 deletions
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
index 863fff96..97ec352f 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
@@ -22,18 +22,8 @@ msbServerAddr: http://127.0.0.1:80
httpServerAddr: http://127.0.0.1:8080
-opentoscaServerAddr: http://127.0.0.1:1337
-
-yamlParseAddr: http://127.0.0.1:8210
-
parserType: zte
-ariaParserAddr: http://127.0.0.1:8204/openoapi/tosca/v1
-
-wso2HostIp: 127.0.0.1
-
-wso2HostPort: 9090
-
#catalogue path to store csar temperarily
cataloguePath: ./catalog
httpServerPath: ../tomcat/webapps/ROOT/
@@ -51,12 +41,6 @@ database:
# the JDBC URL
url: jdbc:mysql://127.0.0.1:3306/catalog
-#LDAP
-ldapServerIp: 127.0.0.1
-ldapServerPort: 20096
-ldapLogindn: uid=admin,ou=system
-ldapPassword: nsoc
-ldapVersion: 3
# use the simple server factory if you only want to run on a single port
#server: