[incubator-dlab] 03/03: Updated self-service.yml

[of...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch multiple-cloud
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 74247b053f968e15b8a93a86923f6321818fca8e
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Thu Jan 9 19:18:04 2020 +0200

    Updated self-service.yml
---
 services/self-service/self-service.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml
index 9edca97..f61e760 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -21,16 +21,13 @@
 
 <#include "ssn.yml">
 
-<#if CLOUD_TYPE == "aws">
 # Minimum and maximum number of slave EMR instances than could be created
 minEmrInstanceCount: 2
 maxEmrInstanceCount: 14
 # Minimum and maximum percentage cost for slave EMR spot instances biding
 minEmrSpotInstanceBidPct: 20
 maxEmrSpotInstanceBidPct: 90
-</#if>
 
-<#if CLOUD_TYPE == "gcp">
 # Maximum length for gcp user name (due to gcp restrictions)
 maxUserNameLength: 10
 # Minimum and maximum number of slave Dataproc instances that could be created
@@ -38,7 +35,6 @@ minInstanceCount: 3
 maxInstanceCount: 15
 minDataprocPreemptibleCount: 0
 gcpOuauth2AuthenticationEnabled: false
-</#if>
 
 # Boundaries for Spark cluster creation
 minSparkInstanceCount: 2
@@ -61,11 +57,7 @@ billingConfFile: ${sys['user.dir']}/../billing/billing.yml
 billingConfFile: ${DLAB_CONF_DIR}/billing.yml
 </#if>
 
-<#if CLOUD_TYPE == "azure">
-azureUseLdap: <LOGIN_USE_LDAP>
 ssnInstanceSize: <SSN_INSTANCE_SIZE>
-maxSessionDurabilityMilliseconds: 288000000
-</#if>
 
 serviceBaseName: SERVICE_BASE_NAME
 os: OPERATION_SYSTEM


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org