diff --git a/README.md b/README.md index 91bb65f..a2ad2f3 100644 --- a/README.md +++ b/README.md @@ -19,28 +19,37 @@ ## Usage +Step 1. Enter citrix admin password as variable #password for windows $env:TF_VAR_ad_admin_password="" + #password for linux export TF_VAR_ad_admin_password="" +Step 2. Rename and enter the correct values +File examples\terraform.template.tfvars.examples + +Step 3. GO +terraform init, terraform plan, apply + ``` module "citrix_core" { - source = "git::https://github.com/dimi4ik/terraform-citrix-mcdg/?ref=v0.0.5" - delivery_group_name = var.delivery_group_name - delivery_group_description = var.delivery_group_description - desktop_description = var.desktop_description - desktop_name = var.desktop_description + #source = "gitlab.abraxas-tools.ch/sit/terraform-azurerm-rg-mvd-v2/azurerg" + source = "git::https://github.com/dimi4ik/terraform-citrix-mcdg/?ref=v0.0.5" + delivery_group_name = var.delivery_group_name + delivery_group_description = var.delivery_group_description + desktop_description = var.desktop_description + desktop_name = var.desktop_name citrix_machine_catalog_description = var.citrix_machine_catalog_description - citrix_machine_catalog_name = var.citrix_machine_catalog_name - citrix_machine_catalog_zone = var.citrix_machine_catalog_zone - ad_admin_password = var.ad_admin_password - ad_admin_username = var.ad_admin_username - provider_hostname = var.provider_hostname - citrix_machine_catalog_account =var.citrix_machine_catalog_account + citrix_machine_catalog_name = var.citrix_machine_catalog_name + citrix_machine_catalog_zone = data.citrix_zone.test_zone.id + ad_admin_password = var.ad_admin_password + ad_admin_username = var.ad_admin_username + provider_hostname = var.provider_hostname + citrix_machine_catalog_account = var.citrix_machine_catalog_account provider_disable_ssl_verification = var.provider_disable_ssl_verification - allow_list = var.allow_list + allow_list = var.allow_list } ``` diff --git a/examples/README.md b/examples/README.md index 29095a9..2f6ca6f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,17 +8,21 @@ ## Providers -No providers. +| Name | Version | +|------|---------| +| [citrix](#provider\_citrix) | 0.6.3 | ## Modules | Name | Source | Version | |------|--------|---------| -| [citrix\_core](#module\_citrix\_core) | git::https://github.com/dimi4ik/terraform-citrix-mcdg/ | v0.0.4 | +| [citrix\_core](#module\_citrix\_core) | git::https://github.com/dimi4ik/terraform-citrix-mcdg/ | v0.0.5 | ## Resources -No resources. +| Name | Type | +|------|------| +| [citrix_zone.test_zone](https://registry.terraform.io/providers/citrix/citrix/latest/docs/data-sources/zone) | data source | ## Inputs @@ -31,6 +35,7 @@ No resources. | [citrix\_machine\_catalog\_description](#input\_citrix\_machine\_catalog\_description) | Description of the machine catalog | `string` | n/a | yes | | [citrix\_machine\_catalog\_name](#input\_citrix\_machine\_catalog\_name) | Name of the machine catalog | `string` | n/a | yes | | [citrix\_machine\_catalog\_zone](#input\_citrix\_machine\_catalog\_zone) | Zone of the machine catalog | `string` | n/a | yes | +| [citrix\_zone](#input\_citrix\_zone) | value | `string` | n/a | yes | | [delivery\_group\_description](#input\_delivery\_group\_description) | Description of the delivery group | `string` | n/a | yes | | [delivery\_group\_name](#input\_delivery\_group\_name) | Name of the Delivery Group to create | `string` | n/a | yes | | [desktop\_description](#input\_desktop\_description) | description of the published desktop | `string` | n/a | yes | diff --git a/examples/main.tf b/examples/main.tf index 862e43f..b4019e9 100644 --- a/examples/main.tf +++ b/examples/main.tf @@ -22,10 +22,7 @@ module "citrix_core" { ad_admin_password = var.ad_admin_password ad_admin_username = var.ad_admin_username provider_hostname = var.provider_hostname - citrix_machine_catalog_account = var.citrix_machine_catalog_account - provider_disable_ssl_verification = var.provider_disable_ssl_verification - allow_list = var.allow_list + citrix_machine_catalog_account = var.citrix_machine_catalog_account + provider_disable_ssl_verification = var.provider_disable_ssl_verification + allow_list = var.allow_list } - - - diff --git a/examples/terraform.template.tfvars.examples b/examples/terraform.template.tfvars.examples index 01baffa..41dfb01 100644 --- a/examples/terraform.template.tfvars.examples +++ b/examples/terraform.template.tfvars.examples @@ -1,18 +1,20 @@ ####################################################################################### -# Variables for the deployment of the Citrix Virtual Apps and Desktops service on Azure -# Variable für neue MVD Umgebung Kunde Allgemein +# Variables for the deployment of the Citrix Virtual Apps and Desktops on Premises +# Rename and enter the correct values ####################################################################################### -ad_admin_username = "domain\\admin" -provider_disable_ssl_verification = true -citrix_machine_catalog_zone = "xxxxxxxxxxxxxxxxxxx" -provider_hostname = "10.0.0.5" -citrix_machine_catalog_name = "mc001" -citrix_machine_catalog_description = "Machine Catalog for the example delivery group" -citrix_machine_catalog_account = "domain\\vda -delivery_group_name = "example-delivery-group" -delivery_group_description = "Delivery Group for the example machine catalog" -desktop_name = "vDesktop" -desktop_description = "Virtual Desktop for the example delivery group" -allow_list = ["domain\\admin"] -citrix_zone = "ctx-test-zone" +citrix_zone = "ctx-test-zone" #Name of the zone the machine catalog is associated with. +ad_admin_username = "domain\\admin" #Active Directory Admin or Citrix Admin Username to connect to DDC server +provider_hostname = "10.0.0.5" #For Citrix on-premises customers (Required): Use this to specify Delivery Controller hostname. +citrix_machine_catalog_name = "mc001" #Name of the machine catalog +citrix_machine_catalog_description = "Machine Catalog for the example delivery group" #Description of the machine catalog +citrix_machine_catalog_account = "domain\\vda" #The Computer AD Account for the machine. Must be in the format DOMAIN\\MACHINE + +delivery_group_name = "example-delivery-group" #Name of the machine catalog +delivery_group_description = "Delivery Group for the example machine catalog" #Description of the machine catalog +desktop_name = "vDesktop" #A list of Desktop resources to publish on the delivery group. +desktop_description = "Virtual #Desktop for the example delivery group" #Description of the published desktop +allow_list = ["domain\\admin"] #Users who can use this Desktop. Must be in DOMAIN\UserOrGroupName or user@domain.com format + + +provider_disable_ssl_verification = true diff --git a/examples/variables.tf b/examples/variables.tf index ebdee71..9915202 100644 --- a/examples/variables.tf +++ b/examples/variables.tf @@ -110,4 +110,4 @@ variable "delivery_group_description" { variable "citrix_zone" { description = "value" type = string -} \ No newline at end of file +} diff --git a/main.tf b/main.tf index 4fa9fd5..e7a749f 100644 --- a/main.tf +++ b/main.tf @@ -42,4 +42,4 @@ resource "citrix_delivery_group" "example_delivery_group" { restricted_access_users = { allow_list = var.allow_list } -} \ No newline at end of file +}