This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DATALAB-2674 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 0725f55a10862704bd6520e960caa86aed8d8ff5 Author: leonidfrolov <[email protected]> AuthorDate: Mon Feb 7 12:02:01 2022 +0200 [DATALAB-2674]: fixed how some variables are passed during ssn creation --- infrastructure-provisioning/scripts/deploy_datalab.py | 6 +++--- .../src/general/scripts/gcp/project_prepare.py | 3 +-- .../src/general/scripts/gcp/ssn_prepare.py | 8 ++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py index edafc90..67db8da 100644 --- a/infrastructure-provisioning/scripts/deploy_datalab.py +++ b/infrastructure-provisioning/scripts/deploy_datalab.py @@ -260,11 +260,11 @@ def build_parser(): gcp_parser.add_argument('--gcp_ssn_instance_size', type=str, default='n1-standard-2', help='The SSN instance shape') gcp_parser.add_argument('--gcp_os_login_enabled', type=str, default='FALSE', - help='TRUE if os login enabled for gcp instances') + help='"TRUE" to enable os login for gcp instances') gcp_parser.add_argument('--gcp_block_project_ssh_keys', type=str, default='FALSE', - help='TRUE to block project ssh keys for gcp instances') + help='"TRUE" to block project ssh keys for gcp instances') gcp_parser.add_argument('--gcp_bucket_enable_versioning', type=str, default='false', - help='TRUE to enable versioning for gcp storage buckets') + help='"true" to enable versioning for gcp storage buckets') gcp_required_args = gcp_parser.add_argument_group('Required arguments') gcp_required_args.add_argument('--gcp_region', type=str, required=True, help='GCP region') diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py index 0ce097b..2b594de 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py @@ -121,8 +121,7 @@ if __name__ == "__main__": else: project_conf['user_subnets_range'] = '' - if os.environ['gcp_bucket_enable_versioning'] != 'false': - project_conf['gcp_bucket_enable_versioning'] = 'true' + project_conf['gcp_bucket_enable_versioning'] = os.environ['gcp_bucket_enable_versioning'] # FUSE in case of absence of user's key try: project_conf['user_key'] = os.environ['key'] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py index 97aa8cf..f485a51 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py @@ -71,12 +71,8 @@ if __name__ == "__main__": "sbn": ssn_conf['service_base_name'], os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']} ssn_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr'] - - if os.environ['gcp_os_login_enabled'] != 'FALSE': - ssn_conf['gcp_os_login_enabled'] = 'TRUE' - - if os.environ['gcp_block_project_ssh_keys'] != 'FALSE': - ssn_conf['gcp_block_project_ssh_keys'] = 'TRUE' + ssn_conf['gcp_os_login_enabled'] = os.environ['gcp_os_login_enabled'] + ssn_conf['gcp_block_project_ssh_keys'] = os.environ['gcp_block_project_ssh_keys'] except Exception as err: datalab.fab.append_result("Failed to generate variables dictionary.", str(err)) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
