From aadf2ae081ae0112177e7e216242e885b79f37b2 Mon Sep 17 00:00:00 2001 From: Brian Bergeron Date: Tue, 3 Aug 2021 09:06:16 -0700 Subject: [PATCH] pass wizard args to az cli (#16532) Co-authored-by: Brian Bergeron --- .../deploy.postgres.existing.arc.ipynb | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb index 73f4def0b3..2822f9d148 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb @@ -114,8 +114,41 @@ "execution_count": null, "source": [ "print (f'Creating the PostgreSQL Hyperscale - Azure Arc instance')\n", + "\n", + "workers = f' --workers {postgres_server_group_workers}' if postgres_server_group_workers else \"\"\n", + "port = f' --port \"{postgres_server_group_port}\"' if postgres_server_group_port else \"\"\n", + "engine_version = f' --engine-version {postgres_server_group_engine_version}' if postgres_server_group_engine_version else \"\"\n", + "extensions = f' --extensions \"{postgres_server_group_extensions}\"' if postgres_server_group_extensions else \"\"\n", + "volume_size_data = f' --volume-size-data {postgres_server_group_volume_size_data}Gi' if postgres_server_group_volume_size_data else \"\"\n", + "volume_size_logs = f' --volume-size-logs {postgres_server_group_volume_size_logs}Gi' if postgres_server_group_volume_size_logs else \"\"\n", + "volume_size_backups = f' --volume-size-backups {postgres_server_group_volume_size_backups}Gi' if postgres_server_group_volume_size_backups else \"\"\n", + "\n", + "def get_per_role_argument(argument, roles, unit=''):\n", + " value = ','.join(f'{role}={value}{unit}' for role,value in roles.items() if value not in (None, ''))\n", + " return f' {argument} {value}' if value else ''\n", + "\n", + "cores_request = get_per_role_argument('--cores-request', {\n", + " 'c': postgres_server_group_coordinator_cores_request,\n", + " 'w': postgres_server_group_workers_cores_request\n", + "})\n", + "\n", + "cores_limit = get_per_role_argument('--cores-limit', {\n", + " 'c': postgres_server_group_coordinator_cores_limit,\n", + " 'w': postgres_server_group_workers_cores_limit\n", + "})\n", + "\n", + "memory_request = get_per_role_argument('--memory-request', {\n", + " 'c': postgres_server_group_coordinator_memory_request,\n", + " 'w': postgres_server_group_workers_memory_request\n", + "}, 'Gi')\n", + "\n", + "memory_limit = get_per_role_argument('--memory-limit', {\n", + " 'c': postgres_server_group_coordinator_memory_limit,\n", + " 'w': postgres_server_group_workers_memory_limit\n", + "}, 'Gi')\n", + "\n", "os.environ[\"AZDATA_PASSWORD\"] = os.environ[\"AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_PASSWORD\"]\n", - "cmd = f'az postgres arc-server create --name {postgres_server_group_name} --k8s-namespace {arc_data_controller_namespace} --use-k8s'\n", + "cmd = f'az postgres arc-server create --name {postgres_server_group_name} --k8s-namespace {arc_data_controller_namespace} --use-k8s --storage-class-data {postgres_storage_class_data} --storage-class-logs {postgres_storage_class_logs} --storage-class-backups {postgres_storage_class_backups}{workers}{port}{engine_version}{extensions}{volume_size_data}{volume_size_logs}{volume_size_backups}{cores_request}{cores_limit}{memory_request}{memory_limit}'\n", "out=run_command()" ], "outputs": [], @@ -124,4 +157,4 @@ } } ] -} +} \ No newline at end of file