From 1d7b250ffa6aff095109c58697bc5e214ab22d07 Mon Sep 17 00:00:00 2001 From: Mike Kletz Date: Wed, 9 Mar 2022 09:54:08 -0600 Subject: [PATCH 01/11] portal --- .../helpdesk_new_user_portal.yml | 12 ++++---- windows/setup.yml | 28 +++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/active_directory/helpdesk_new_user_portal.yml index 58b1e52..e6678a1 100644 --- a/windows/active_directory/helpdesk_new_user_portal.yml +++ b/windows/active_directory/helpdesk_new_user_portal.yml @@ -17,16 +17,14 @@ company: BobCo password: "{{ temp_password }}" state: present - groups: - - "GroupA" - - "GroupB" - street: 123 4th St. - city: Sometown + groups: {{ groups }} + street: "{{ street }}" + city: "{{ city }}" state_province: IN - postal_code: 12345 + postal_code: "{{ postal_code }}" country: US attributes: - telephoneNumber: 555-123456 + telephoneNumber: "{{ telephone_number }}" register: new_user - name: Display User diff --git a/windows/setup.yml b/windows/setup.yml index 64508b5..e0001ad 100644 --- a/windows/setup.yml +++ b/windows/setup.yml @@ -244,6 +244,34 @@ controller_templates: type: text variable: surname required: true + - question_name: Street + type: text + variable: street + default: 123 4th St. + required: false + - question_name: City + type: text + variable: city + default: Sometown + required: false + - question_name: Postal code + type: text + variable: postal_code + default: IN + required: false + - question_name: Telephone number + type: text + variable: telephone_number + default: 555-123456 + required: false + - question_name: Groups + type: multiplechoice + variable: groups + required: false + choices: + - GroupA + - GroupB + - GroupC - name: "Rollback" job_type: run From 46990020e69798d7566bf191f9705985b33cea24 Mon Sep 17 00:00:00 2001 From: Mike Kletz Date: Wed, 9 Mar 2022 09:58:05 -0600 Subject: [PATCH 02/11] groups --- windows/active_directory/helpdesk_new_user_portal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/active_directory/helpdesk_new_user_portal.yml index e6678a1..59633bb 100644 --- a/windows/active_directory/helpdesk_new_user_portal.yml +++ b/windows/active_directory/helpdesk_new_user_portal.yml @@ -17,7 +17,7 @@ company: BobCo password: "{{ temp_password }}" state: present - groups: {{ groups }} + groups: groups street: "{{ street }}" city: "{{ city }}" state_province: IN From f8f72041fa79cabd70275eccf8e6979757ff04d0 Mon Sep 17 00:00:00 2001 From: Mike Kletz Date: Wed, 9 Mar 2022 10:02:16 -0600 Subject: [PATCH 03/11] facts --- windows/active_directory/helpdesk_new_user_portal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/active_directory/helpdesk_new_user_portal.yml index 59633bb..393f075 100644 --- a/windows/active_directory/helpdesk_new_user_portal.yml +++ b/windows/active_directory/helpdesk_new_user_portal.yml @@ -1,6 +1,7 @@ --- - name: Helpdesk new user portal hosts: "{{ HOSTS | default('windows') }}" + gather_facts: false tasks: - name: Setting host facts using complex arguments From b9177b7f44d4ef5928b20660373d7ce84476d296 Mon Sep 17 00:00:00 2001 From: Mike Kletz Date: Wed, 9 Mar 2022 10:05:16 -0600 Subject: [PATCH 04/11] group --- windows/active_directory/helpdesk_new_user_portal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/active_directory/helpdesk_new_user_portal.yml index 393f075..091d966 100644 --- a/windows/active_directory/helpdesk_new_user_portal.yml +++ b/windows/active_directory/helpdesk_new_user_portal.yml @@ -18,7 +18,7 @@ company: BobCo password: "{{ temp_password }}" state: present - groups: groups + groups: {{ groups }} street: "{{ street }}" city: "{{ city }}" state_province: IN From 199ede57875b99258e6706b3ac2d928ba5a7944c Mon Sep 17 00:00:00 2001 From: Mike Kletz Date: Wed, 9 Mar 2022 10:10:37 -0600 Subject: [PATCH 05/11] groups --- windows/active_directory/helpdesk_new_user_portal.yml | 4 +++- windows/setup.yml | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/active_directory/helpdesk_new_user_portal.yml index 091d966..a9d61ba 100644 --- a/windows/active_directory/helpdesk_new_user_portal.yml +++ b/windows/active_directory/helpdesk_new_user_portal.yml @@ -18,7 +18,9 @@ company: BobCo password: "{{ temp_password }}" state: present - groups: {{ groups }} + groups: + - "GroupA" + - "GroupB" street: "{{ street }}" city: "{{ city }}" state_province: IN diff --git a/windows/setup.yml b/windows/setup.yml index e0001ad..b9bac53 100644 --- a/windows/setup.yml +++ b/windows/setup.yml @@ -264,14 +264,6 @@ controller_templates: variable: telephone_number default: 555-123456 required: false - - question_name: Groups - type: multiplechoice - variable: groups - required: false - choices: - - GroupA - - GroupB - - GroupC - name: "Rollback" job_type: run From 5ba52c43a84c13cee05242760621bf0f0a67edc5 Mon Sep 17 00:00:00 2001 From: mkletz Date: Wed, 27 Apr 2022 14:03:26 -0500 Subject: [PATCH 06/11] removed facts --- windows/active_directory/create_ad_domain.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 36ec940..7332af0 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -1,6 +1,7 @@ --- - name: Create Active Directory domain hosts: "{{ HOSTS | default('windows') }}" + gather_facts: false tasks: - name: Create new domain in a new forest on the target host From 01b01cded5da2dd979f2421579949d3e81212aa3 Mon Sep 17 00:00:00 2001 From: mkletz Date: Wed, 27 Apr 2022 14:12:06 -0500 Subject: [PATCH 07/11] check for ADWS --- windows/active_directory/create_ad_domain.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 7332af0..92a17db 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -15,6 +15,14 @@ reboot_timeout: 3600 when: new_forest.reboot_required + - name: Wait 10min for AD web services to start + community.windows.win_wait_for_process: + process_name_exact: Microsoft.ActiveDirectory.WebServices + pre_wait_delay: 60 + state: present + timeout: 600 + sleep: 10 + - name: Create some groups community.windows.win_domain_group: name: "{{ item.name }}" From ecf14476713dc2dc2756e1e060f4ebb43abd3fb4 Mon Sep 17 00:00:00 2001 From: mkletz Date: Wed, 27 Apr 2022 14:15:01 -0500 Subject: [PATCH 08/11] wait for service --- windows/active_directory/create_ad_domain.yml | 2 +- windows/setup.yml | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 92a17db..490bbbd 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -1,6 +1,6 @@ --- - name: Create Active Directory domain - hosts: "{{ HOSTS | default('windows') }}" + hosts: windows gather_facts: false tasks: diff --git a/windows/setup.yml b/windows/setup.yml index b9bac53..fbf189a 100644 --- a/windows/setup.yml +++ b/windows/setup.yml @@ -213,15 +213,7 @@ controller_templates: execution_environment: Default execution environment credentials: - "Workshop Credential" - survey_enabled: true - survey: - name: '' - description: '' - spec: - - question_name: Server Name or Pattern - type: text - variable: HOSTS - required: false + survey_enabled: false - name: "ACTIVE DIRECTORY / Helpdesk new user portal" job_type: run From 227ba07d28929689301e001c2f23a8135cdc0dd3 Mon Sep 17 00:00:00 2001 From: mkletz Date: Wed, 27 Apr 2022 15:20:13 -0500 Subject: [PATCH 09/11] fixed password update --- windows/active_directory/create_ad_domain.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 490bbbd..1aca426 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -37,6 +37,7 @@ name: "{{ item.name }}" groups: "{{ item.groups }}" password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}" + update_password: on_create loop: - { name: "UserA", groups: "GroupA" } - { name: "UserB", groups: "GroupB" } From 2c51cf661b3a6d8e35dc1d735979acad28cbc6ec Mon Sep 17 00:00:00 2001 From: mkletz Date: Wed, 27 Apr 2022 15:23:30 -0500 Subject: [PATCH 10/11] name --- windows/active_directory/create_ad_domain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 1aca426..212b3ac 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -15,7 +15,7 @@ reboot_timeout: 3600 when: new_forest.reboot_required - - name: Wait 10min for AD web services to start + - name: Wait up to 10min for AD web services to start community.windows.win_wait_for_process: process_name_exact: Microsoft.ActiveDirectory.WebServices pre_wait_delay: 60 From afeb64d28367fadb7b8fb8b6108379d62adc0b81 Mon Sep 17 00:00:00 2001 From: mkletz Date: Mon, 16 May 2022 09:48:29 -0500 Subject: [PATCH 11/11] survey --- windows/active_directory/create_ad_domain.yml | 2 +- windows/setup.yml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml index 212b3ac..00ee7d2 100644 --- a/windows/active_directory/create_ad_domain.yml +++ b/windows/active_directory/create_ad_domain.yml @@ -1,6 +1,6 @@ --- - name: Create Active Directory domain - hosts: windows + hosts: "{{ HOSTS | default('windows') }}" gather_facts: false tasks: diff --git a/windows/setup.yml b/windows/setup.yml index fbf189a..b9bac53 100644 --- a/windows/setup.yml +++ b/windows/setup.yml @@ -213,7 +213,15 @@ controller_templates: execution_environment: Default execution environment credentials: - "Workshop Credential" - survey_enabled: false + survey_enabled: true + survey: + name: '' + description: '' + spec: + - question_name: Server Name or Pattern + type: text + variable: HOSTS + required: false - name: "ACTIVE DIRECTORY / Helpdesk new user portal" job_type: run