This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1487
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit bb3ac17eeb2875e184e5e132d28d433391054729
Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com>
AuthorDate: Thu Jan 30 11:26:51 2020 +0200
[DLAB-1487]: [Azure] Shared endpoint bucket should be created during
project creation hot bugs fixes
---
.../src/general/scripts/azure/ssn_configure.py | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 2faa7ed..967be30 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -55,16 +55,11 @@ if __name__ == "__main__":
ssn_conf['security_group_name'] =
os.environ.get('azure_security_group_name',
'{}-sg'.format(ssn_conf['service_base_name']))
# Default variables
ssn_conf['region'] = os.environ['azure_region']
- ssn_conf['ssn_storage_account_name'] =
'{}-ssn-storage'.format(ssn_conf['service_base_name'])
ssn_conf['ssn_container_name'] =
'{}-ssn-container'.format(ssn_conf['service_base_name']).lower()
ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
- ssn_conf['shared_storage_account_name'] =
'{0}-{1}-shared-storage'.format(ssn_conf['service_base_name'],
-
ssn_conf['default_endpoint_name'])
- ssn_conf['shared_container_name'] =
'{}-shared-container'.format(ssn_conf['service_base_name']).lower()
ssn_conf['datalake_store_name'] =
'{}-ssn-datalake'.format(ssn_conf['service_base_name'])
ssn_conf['datalake_shared_directory_name'] =
'{}-shared-folder'.format(ssn_conf['service_base_name'])
ssn_conf['instance_name'] =
'{}-ssn'.format(ssn_conf['service_base_name'])
-
ssn_conf['ssh_key_path'] = os.environ['conf_key_dir'] +
os.environ['conf_key_name'] + '.pem'
ssn_conf['dlab_ssh_user'] = os.environ['conf_os_user']
if os.environ['conf_network_type'] == 'private':
@@ -121,11 +116,6 @@ if __name__ == "__main__":
ssn_conf['subnet_name'])
if 'azure_security_group_name' not in os.environ:
AzureActions().remove_security_group(ssn_conf['resource_group_name'],
ssn_conf['security_group_name'])
- for storage_account in
AzureMeta().list_storage_accounts(ssn_conf['resource_group_name']):
- if ssn_conf['ssn_storage_account_name'] ==
storage_account.tags["Name"]:
-
AzureActions().remove_storage_account(ssn_conf['resource_group_name'],
storage_account.name)
- if ssn_conf['shared_storage_account_name'] ==
storage_account.tags["Name"]:
-
AzureActions().remove_storage_account(ssn_conf['resource_group_name'],
storage_account.name)
for datalake in
AzureMeta().list_datalakes(ssn_conf['resource_group_name']):
if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
AzureActions().delete_datalake_store(ssn_conf['resource_group_name'],
datalake.name)
@@ -306,14 +296,6 @@ if __name__ == "__main__":
'value': ssn_conf['resource_group_name']
},
{
- 'key': 'AZURE_SSN_STORAGE_ACCOUNT_TAG',
- 'value': ssn_conf['ssn_storage_account_name']
- },
- {
- 'key': 'AZURE_SHARED_STORAGE_ACCOUNT_TAG',
- 'value': ssn_conf['shared_storage_account_name']
- },
- {
'key': 'GCP_PROJECT_ID',
'value': ''
},
@@ -448,11 +430,6 @@ if __name__ == "__main__":
try:
logging.info('[SUMMARY]')
- for storage_account in
AzureMeta().list_storage_accounts(ssn_conf['resource_group_name']):
- if ssn_conf['ssn_storage_account_name'] ==
storage_account.tags["Name"]:
- ssn_storage_account_name = storage_account.name
- if ssn_conf['shared_storage_account_name'] ==
storage_account.tags["Name"]:
- shared_storage_account_name = storage_account.name
print('[SUMMARY]')
print("Service base name: {}".format(ssn_conf['service_base_name']))
@@ -467,10 +444,6 @@ if __name__ == "__main__":
print("Subnet Name: {}".format(ssn_conf['subnet_name']))
print("Firewall Names: {}".format(ssn_conf['security_group_name']))
print("SSN instance size:
{}".format(os.environ['azure_ssn_instance_size']))
- print("SSN storage account name: {}".format(ssn_storage_account_name))
- print("SSN container name: {}".format(ssn_conf['ssn_container_name']))
- print("Shared storage account name:
{}".format(shared_storage_account_name))
- print("Shared container name:
{}".format(ssn_conf['shared_container_name']))
if os.environ['azure_datalake_enable'] == 'true':
for datalake in
AzureMeta().list_datalakes(ssn_conf['resource_group_name']):
if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
@@ -502,10 +475,6 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"security_id": ssn_conf['security_group_name'],
"instance_shape": os.environ['azure_ssn_instance_size'],
- "ssn_storage_account_name": ssn_storage_account_name,
- "ssn_container_name": ssn_conf['ssn_container_name'],
- "shared_storage_account_name":
shared_storage_account_name,
- "shared_container_name":
ssn_conf['shared_container_name'],
"region": ssn_conf['region'],
"action": "Create SSN instance"}
else:
@@ -517,10 +486,6 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"security_id": ssn_conf['security_group_name'],
"instance_shape": os.environ['azure_ssn_instance_size'],
- "ssn_storage_account_name": ssn_storage_account_name,
- "ssn_container_name": ssn_conf['ssn_container_name'],
- "shared_storage_account_name":
shared_storage_account_name,
- "shared_container_name":
ssn_conf['shared_container_name'],
"datalake_name": datalake_store_name,
"datalake_shared_directory_name":
ssn_conf['datalake_shared_directory_name'],
"region": ssn_conf['region'],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
