You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/11/01 13:47:08 UTC
[incubator-dlab] branch DLAB-1158 updated: added shared image
parameter;
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 23d4916 added shared image parameter;
23d4916 is described below
commit 23d4916b432115f36708adf015f84c85eaa5f67f
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Nov 1 15:46:54 2019 +0200
added shared image parameter;
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 7 +++++--
infrastructure-provisioning/terraform/bin/deploy/provisioning.yml | 1 +
infrastructure-provisioning/terraform/bin/dlab.py | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 414eb98..02e39c4 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -431,8 +431,6 @@ def configure_supervisor_endpoint(endpoint_keystore_password):
'key': "LDAP_USER_PASSWORD",
'value': args.ldap_bind_creds
},
-
-
{
'key': "STEP_CERTS_ENABLED",
'value': "true"
@@ -453,6 +451,10 @@ def configure_supervisor_endpoint(endpoint_keystore_password):
'key': "STEP_CA_URL",
'value': args.step_ca_url
},
+ {
+ 'key': "SHARED_IMAGE_ENABLED",
+ 'value': args.shared_image_enabled
+ }
]
for param in cloud_properties:
conn.sudo('sed -i "s|{0}|{1}|g" {2}provisioning.yml'
@@ -708,6 +710,7 @@ def init_args():
parser.add_argument('--step_kid', type=str, default='')
parser.add_argument('--step_kid_password', type=str, default='')
parser.add_argument('--step_ca_url', type=str, default='')
+ parser.add_argument('--shared_image_enabled', type=str, default='true')
# TEMPORARY
parser.add_argument('--ssn_k8s_nlb_dns_name', type=str, default='')
diff --git a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
index 400f901..568b333 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
@@ -171,6 +171,7 @@ cloudProperties:
datalakeTagName: AZURE_DATALAKE_TAG
azureClientId: AZURE_CLIENT_ID
gcpProjectId: GCP_PROJECT_ID
+ sharedImageEnabled: SHARED_IMAGE_ENABLED
ldap:
host: LDAP_HOST
dn: LDAP_DN
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py b/infrastructure-provisioning/terraform/bin/dlab.py
index b6a21fb..1361849 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -970,6 +970,8 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
group='endpoint')
.add_str('--ldap_users_group', 'ldap users group', required=True,
group='endpoint')
+ .add_str('--shared_image_enabled', 'Enable ot Disable shared image', default='true',
+ group='endpoint')
)
return params.build()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org