You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2019/10/15 14:23:47 UTC
[incubator-dlab] branch DLAB-1179 updated: [DLAB-1179] Updated
parameters in config files
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1179
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1179 by this push:
new a849df1 [DLAB-1179] Updated parameters in config files
a849df1 is described below
commit a849df1103ea634f70fc852db08611e45bb6d202
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Tue Oct 15 17:23:18 2019 +0300
[DLAB-1179] Updated parameters in config files
---
services/billing-azure/billing.yml | 6 +++---
.../com/epam/dlab/billing/azure/AzureBillableResourcesService.java | 5 +++--
services/self-service/self-service.yml | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/services/billing-azure/billing.yml b/services/billing-azure/billing.yml
index b89d939..da47bd1 100644
--- a/services/billing-azure/billing.yml
+++ b/services/billing-azure/billing.yml
@@ -53,9 +53,9 @@ aggregationOutputMongoDataSource:
password: <MONGODB_PASSWORD>
database: dlabdb
-ssnStorageAccountTagName: AZURE_SSN_STORAGE_ACCOUNT_TAG
-sharedStorageAccountTagName: AZURE_SHARED_STORAGE_ACCOUNT_TAG
-datalakeTagName: AZURE_DATALAKE_TAG
+ssnStorageAccountTagName: <AZURE_SSN_STORAGE_ACCOUNT_TAG>
+sharedStorageAccountTagName: <AZURE_SHARED_STORAGE_ACCOUNT_TAG>
+datalakeTagName: <AZURE_DATALAKE_TAG>
# Logging configuration.
logging:
diff --git a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
index a311109..292ee0c 100644
--- a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
+++ b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
@@ -60,7 +60,9 @@ public class AzureBillableResourcesService {
* Constructs the service class
*
* @param mongoDbBillingClient mongodb client to retrieve all billable resources
- * TODO add parameters(@param)
+ * @param sharedStorageAccountTagName shared storage account tag name
+ * @param ssnStorageAccountTagName ssn storage account tag name
+ * @param azureDataLakeTagName azure DataLake tag name
*/
public AzureBillableResourcesService(MongoDbBillingClient mongoDbBillingClient, String sharedStorageAccountTagName,
String ssnStorageAccountTagName, String azureDataLakeTagName) {
@@ -72,7 +74,6 @@ public class AzureBillableResourcesService {
this.sharedStorageAccountTagName = sharedStorageAccountTagName;
this.ssnStorageAccountTagName = ssnStorageAccountTagName;
this.azureDataLakeTagName = azureDataLakeTagName;
- log.warn("TEST_TEST " + sharedStorageAccountTagName + ssnStorageAccountTagName + azureDataLakeTagName);
}
diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml
index 043d952..448b0c2 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -63,7 +63,7 @@ billingConfFile: ${DLAB_CONF_DIR}/billing.yml
<#if CLOUD_TYPE == "azure">
azureUseLdap: <LOGIN_USE_LDAP>
-ssnInstanceSize: Standard_DS2_v2
+ssnInstanceSize: <SSN_INSTANCE_SIZE>
maxSessionDurabilityMilliseconds: 288000000
</#if>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org