Skip to content

Commit 2cb1439

Browse files
Refactor to Azure Workspace Module
* Seperated the Azure Workspace from Cluster * Update Version.tf * Outputs.tf modified * main.tf modified * Global Init Scripts reverted * Versions Upgraded * GIS updates * Azure Databricks Workspace Modularized * terraform-docs: automated action * Updates on the review comments --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 724eb96 commit 2cb1439

File tree

26 files changed

+163
-428
lines changed

26 files changed

+163
-428
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ crash.log
1515
# .tfvars files are managed as part of configuration and so should be included in
1616
# version control.
1717
#
18-
# example.tfvars
18+
.tfvars
1919

2020
# Ignore override files as they are usually used to override resources locally and so
2121
# are not checked in

README.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<p align="center">
2-
<img src="https://github.com/intel/terraform-intel-azure-databricks/blob/main/images/logo-classicblue-800px.png?raw=true" alt="Intel Logo" width="250"/>
2+
<img src="https://github.com/intel/terraform-intel-azure-databricks-workspace/blob/main/images/logo-classicblue-800px.png?raw=true" alt="Intel Logo" width="250"/>
33
</p>
44

55
# Intel® Cloud Optimization Modules for Terraform
66

77
© Copyright 2022, Intel Corporation
88

99
## Azure Databricks
10-
The module can deploy an Intel Optimized Azure Databricks Workspace and Cluster. Instance Selection and Intel Optimizations have been defaulted in the code.
10+
The module can deploy an Intel Optimized Azure Databricks Workspace.
1111

1212
**Learn more about optimizations :**
1313

@@ -26,7 +26,7 @@ Example of main.tf
2626
# Provision Intel Cloud Optimization Module
2727
2828
module "module-example" {
29-
source = "intel/azure-databricks/intel"
29+
source = "intel/azure-databricks-workspace/intel"
3030
resource_group_name = <"ENTER_YOUR_RESOURCE_GROUP_NAME"> #Required. Enter an pre-existing resource group you want Azure Databricks Workspace to deploy in
3131
dbx_workspace_name = <"NAME_YOUR_DATABRICKS_WORKSPACE"> #Required. Enter a name for your Azure Databricks Workspace
3232
@@ -56,28 +56,27 @@ More Information regarding deploying and [Managing Databricks](https://registry.
5656
| Name | Version |
5757
|------|---------|
5858
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.48 |
59-
| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | ~> 1.13.0 |
59+
| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | ~> 1.14.2 |
6060
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.4.3 |
6161

6262
## Providers
6363

6464
| Name | Version |
6565
|------|---------|
6666
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 3.48 |
67+
| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | ~> 1.14.2 |
6768
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.4.3 |
6869

6970
## Modules
7071

71-
| Name | Source | Version |
72-
|------|--------|---------|
73-
| <a name="module_databricks_cluster"></a> [databricks\_cluster](#module\_databricks\_cluster) | ./cluster | n/a |
74-
| <a name="module_gis"></a> [gis](#module\_gis) | ./global_init_scripts | n/a |
72+
No modules.
7573

7674
## Resources
7775

7876
| Name | Type |
7977
|------|------|
8078
| [azurerm_databricks_workspace.az-databricks](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/databricks_workspace) | resource |
79+
| [databricks_global_init_script.intel_optimized_script](https://registry.terraform.io/providers/databricks/databricks/latest/docs/resources/global_init_script) | resource |
8180
| [random_string.naming](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
8281
| [azurerm_resource_group.databricks](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source |
8382
| [azurerm_subnet.dbx-private](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source |
@@ -103,14 +102,6 @@ More Information regarding deploying and [Managing Databricks](https://registry.
103102

104103
| Name | Description |
105104
|------|-------------|
106-
| <a name="output_dbx_cluster_autoterminate_min"></a> [dbx\_cluster\_autoterminate\_min](#output\_dbx\_cluster\_autoterminate\_min) | Autoterminate minute of the databricks cluster |
107-
| <a name="output_dbx_cluster_custom_tags"></a> [dbx\_cluster\_custom\_tags](#output\_dbx\_cluster\_custom\_tags) | Custom Tags |
108-
| <a name="output_dbx_cluster_name"></a> [dbx\_cluster\_name](#output\_dbx\_cluster\_name) | Name of the databricks cluster |
109-
| <a name="output_dbx_cluster_node_type_id"></a> [dbx\_cluster\_node\_type\_id](#output\_dbx\_cluster\_node\_type\_id) | Instance type of the databricks cluster |
110-
| <a name="output_dbx_cluster_num_workers"></a> [dbx\_cluster\_num\_workers](#output\_dbx\_cluster\_num\_workers) | Num of workers nodes of the databricks cluster |
111-
| <a name="output_dbx_cluster_runtime_engine"></a> [dbx\_cluster\_runtime\_engine](#output\_dbx\_cluster\_runtime\_engine) | Runtime Engine of the databricks cluster |
112-
| <a name="output_dbx_cluster_spark_conf"></a> [dbx\_cluster\_spark\_conf](#output\_dbx\_cluster\_spark\_conf) | Spark Configurations of the databricks cluster |
113-
| <a name="output_dbx_cluster_spark_version"></a> [dbx\_cluster\_spark\_version](#output\_dbx\_cluster\_spark\_version) | Spark version of the databricks cluster |
114105
| <a name="output_dbx_custom_parameters"></a> [dbx\_custom\_parameters](#output\_dbx\_custom\_parameters) | Custom parameter block of the databricks workspace |
115106
| <a name="output_dbx_location"></a> [dbx\_location](#output\_dbx\_location) | Location of the databricks workspace |
116107
| <a name="output_dbx_network_security_group_rules_required"></a> [dbx\_network\_security\_group\_rules\_required](#output\_dbx\_network\_security\_group\_rules\_required) | NSG outbound rules of the databricks workspace |

cluster/cluster.tf

Lines changed: 0 additions & 27 deletions
This file was deleted.

cluster/outputs.tf

Lines changed: 0 additions & 45 deletions
This file was deleted.

cluster/variables.tf

Lines changed: 0 additions & 78 deletions
This file was deleted.

cluster/versions.tf

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/databricks-workspace-cluster-custom-vnet/outputs.tf

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)