You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/03/02 09:27:58 UTC
[incubator-datalab] 02/02: [DATALAB-2091]: corrected roles` names
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 029a5f77fa26739a48d3bab6d54a1452e851214c
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Mar 1 14:56:57 2021 +0200
[DATALAB-2091]: corrected roles` names
---
.../src/general/scripts/gcp/edge_configure.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index e1d5187..f8d1266 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -53,8 +53,8 @@ if __name__ == "__main__":
GCPActions.remove_firewall(edge_conf['fw_ps_egress_private'])
GCPActions.remove_firewall(edge_conf['fw_ps_egress_public'])
GCPActions.remove_service_account(edge_conf['ps_service_account_name'], edge_conf['service_base_name'])
- GCPActions.remove_role(edge_conf['ps_role_name'])
GCPActions.remove_service_account(edge_conf['edge_service_account_name'], edge_conf['service_base_name'])
+ GCPActions.remove_role(edge_conf['ps_role_name'])
GCPActions.remove_role(edge_conf['edge_role_name'])
GCPActions.remove_subnet(edge_conf['subnet_name'], edge_conf['region'])
@@ -89,15 +89,14 @@ if __name__ == "__main__":
edge_conf['endpoint_name'])
edge_conf['edge_unique_index'] = GCPMeta.get_index_by_service_account_name(
edge_conf['edge_service_account_name'])
- edge_conf['edge_role_name'] = '{}-{}-{}-edge-role'.format(edge_conf['service_base_name'],
- edge_conf['project_name'],
- edge_conf['edge_unique_index'])
+ edge_conf['edge_role_name'] = '{}-{}-{}-{}-edge-role'.format(edge_conf['service_base_name'], edge_conf['project_name'],
+ edge_conf['endpoint_name'], edge_conf['edge_unique_index'])
edge_conf['ps_service_account_name'] = '{}-{}-{}-ps-sa'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
edge_conf['endpoint_name'])
edge_conf['ps_unique_index'] = GCPMeta.get_index_by_service_account_name(edge_conf['ps_service_account_name'])
- edge_conf['ps_role_name'] = '{}-{}-{}-ps-role'.format(edge_conf['service_base_name'],
- edge_conf['project_name'], edge_conf['ps_unique_index'])
+ edge_conf['ps_role_name'] = '{}-{}-{}-{}-ps-role'.format(edge_conf['service_base_name'], edge_conf['project_name'],
+ edge_conf['endpoint_name'], edge_conf['ps_unique_index'])
edge_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['firewall_name'] = edge_conf['instance_name'] + '{}-sg'.format(edge_conf['instance_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org