You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/10/21 15:02:54 UTC
[incubator-dlab] branch DLAB-1145 updated: fix typo
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1145
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1145 by this push:
new 36adccf fix typo
36adccf is described below
commit 36adccf7d56cff1eac3bd734fff77345812f9ad4
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Mon Oct 21 17:47:14 2019 +0300
fix typo
---
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 2 ++
.../src/general/scripts/azure/ssn_configure.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index ab6191d..97aee88 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -506,6 +506,7 @@ if __name__ == "__main__":
"--usage {} " \
"--cost {} " \
"--resource_id {} " \
+ "--default_endpoint_name {} " \
"--tags {}". \
format(instance_hostname,
"{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']),
@@ -531,6 +532,7 @@ if __name__ == "__main__":
os.environ['usage'],
os.environ['cost'],
os.environ['resource_id'],
+ os.environ['default_endpoint_name'],
os.environ['tags'])
try:
local("~/scripts/{}.py {}".format('configure_ui', params))
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index b666da0..3a840a6 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -349,14 +349,14 @@ if __name__ == "__main__":
--resource {} --service_base_name {} --cloud_provider {} --billing_enabled {} --authentication_file {} \
--offer_number {} --currency {} --locale {} --region_info {} --ldap_login {} --tenant_id {} \
--application_id {} --datalake_store_name {} --cloud_params '{}' --subscription_id {} \
- --validate_permission_scope {}". \
+ --validate_permission_scope {} --default_endpoint_name {}". \
format(ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], os.environ['ssn_dlab_path'],
ssn_conf['dlab_ssh_user'], os.environ['conf_os_family'], os.environ['request_id'],
os.environ['conf_resource'], ssn_conf['service_base_name'], os.environ['conf_cloud_provider'],
billing_enabled, azure_auth_path, os.environ['azure_offer_number'],
os.environ['azure_currency'], os.environ['azure_locale'], os.environ['azure_region_info'],
ldap_login, tenant_id, datalake_application_id, datalake_store_name, json.dumps(cloud_params),
- subscription_id, os.environ['azure_validate_permission_scope'])
+ subscription_id, os.environ['azure_validate_permission_scope'], ssn_conf['default_endpoint_name'])
local("~/scripts/{}.py {}".format('configure_ui', params))
except Exception as err:
#print('Error: {0}'.format(err))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org