Merge "add adminUserDomainId and adminUserProjectId support to monasca-api"
This commit is contained in:
commit
697aeca864
|
@ -80,7 +80,9 @@ middleware:
|
|||
adminPassword: admin
|
||||
adminProjectId:
|
||||
adminProjectName:
|
||||
adminUserDomainId:
|
||||
adminUserDomainName:
|
||||
adminProjectDomainId:
|
||||
adminProjectDomainName:
|
||||
adminToken:
|
||||
timeToCacheToken: 600
|
||||
|
|
|
@ -182,7 +182,9 @@ 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_ID, config.middleware.adminUserDomainId);
|
||||
authInitParams.put(AuthConstants.ADMIN_USER_DOMAIN_NAME, config.middleware.adminUserDomainName);
|
||||
authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_ID, config.middleware.adminProjectDomainId);
|
||||
authInitParams.put(AuthConstants.ADMIN_PROJECT_DOMAIN_NAME, config.middleware.adminProjectDomainName);
|
||||
authInitParams.put("MaxTokenCacheSize", config.middleware.maxTokenCacheSize);
|
||||
setIfNotNull(authInitParams, AuthConstants.TRUSTSTORE, config.middleware.truststore);
|
||||
|
|
|
@ -67,8 +67,12 @@ public class MiddlewareConfiguration {
|
|||
@JsonProperty
|
||||
public String adminProjectName = "";
|
||||
@JsonProperty
|
||||
public String adminUserDomainId = "";
|
||||
@JsonProperty
|
||||
public String adminUserDomainName = "";
|
||||
@JsonProperty
|
||||
public String adminProjectDomainId = "";
|
||||
@JsonProperty
|
||||
public String adminProjectDomainName = "";
|
||||
@JsonProperty
|
||||
public String maxTokenCacheSize = "1048576";
|
||||
|
|
|
@ -79,7 +79,9 @@ middleware:
|
|||
adminPassword: admin
|
||||
adminProjectId:
|
||||
adminProjectName:
|
||||
adminUserDomainId:
|
||||
adminUserDomainName:
|
||||
adminUserProjectId:
|
||||
adminUserProjectName:
|
||||
adminToken:
|
||||
timeToCacheToken: 600
|
||||
|
|
Loading…
Reference in New Issue