openstack
/
monasca-api
Code Issues Proposed changes

Merge "Add adminUserDomainName and adminProjectDomainName to monasca-api"

This commit is contained in:
Jenkins 2015-09-18 02:25:16 +00:00 committed by Gerrit Code Review
parent 76f651258f 71575490b5
commit 81a2160d9e
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/deb/etc/api-config.yml-sample
View File

@ -80,6 +80,8 @@ middleware:
adminPassword: admin
adminProjectId:
adminProjectName:
adminUserDomainName:
adminProjectDomainName:
adminToken:
timeToCacheToken: 600
maxTokenCacheSize: 1048576

2
java/src/main/java/monasca/api/MonApiApplication.java
View File

@ -182,6 +182,8 @@ public class MonApiApplication extends Application<ApiConfig> {
authInitParams.put("AdminPassword", config.middleware.adminPassword);
authInitParams.put(AuthConstants.ADMIN_PROJECT_ID, config.middleware.adminProjectId);
authInitParams.put(AuthConstants.ADMIN_PROJECT_NAME, config.middleware.adminProjectName);
authInitParams.put(AuthConstants.ADMIN_USER_DOMAIN_NAME, config.middleware.adminUserDomainName);
authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_NAME, config.middleware.adminProjectDomainName);
authInitParams.put("MaxTokenCacheSize", config.middleware.maxTokenCacheSize);
setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE, config.middleware.truststore);
setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE_PASS, config.middleware.truststorePassword);

4
java/src/main/java/monasca/api/infrastructure/middleware/MiddlewareConfiguration.java
View File

@ -67,6 +67,10 @@ public class MiddlewareConfiguration {
@JsonProperty
public String adminProjectName = "";
@JsonProperty
public String adminUserDomainName = "";
@JsonProperty
public String adminProjectDomainName = "";
@JsonProperty
public String maxTokenCacheSize = "1048576";
@JsonProperty
public String truststore;

2
java/src/main/resources/api-config.yml
View File

@ -79,6 +79,8 @@ middleware:
adminPassword: admin
adminProjectId:
adminProjectName:
adminUserDomainName:
adminUserProjectName:
adminToken:
timeToCacheToken: 600
maxTokenCacheSize: 1048576