openstack
/
monasca-api
Code Issues Proposed changes

Add adminUserDomainName and adminProjectDomainName to monasca-api 

add adminUserDomainName and adminProjectDomainName to api-config.yaml
to scope the username or projectname with a domainname

Change-Id: Ide981dc079be7ec18abfaadc456c5b24c386dfc5
Depends-On: I12e0a1594961ef15eac6e401521d05a15a2014ad
Closes-Bug: #1484594
This commit is contained in:
Thomas Graichen 2015-08-19 16:49:12 +02:00 committed by Joachim Barheine
parent c445456b05
commit 71575490b5
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

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