diff options
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/dc01/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/dc01/tasks/populate_ad.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/dc01/tasks/set_hostname.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/dc01/tasks/setup_domain.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/dc01/tasks/setup_gpo.yaml | 4 | ||||
| -rw-r--r-- | ansible/roles/proxmox_vm/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | ansible/roles/srv01/tasks/main.yaml | 8 |
7 files changed, 13 insertions, 11 deletions
diff --git a/ansible/roles/dc01/tasks/main.yaml b/ansible/roles/dc01/tasks/main.yaml index 2ce79c9..d9b0b40 100644 --- a/ansible/roles/dc01/tasks/main.yaml +++ b/ansible/roles/dc01/tasks/main.yaml @@ -4,8 +4,6 @@ port: "{{ ansible_port }}" timeout: 300 delegate_to: localhost - vars: - ansible_connection: local - name: execute init.ps1 import_tasks: init.yaml diff --git a/ansible/roles/dc01/tasks/populate_ad.yaml b/ansible/roles/dc01/tasks/populate_ad.yaml index 1cc0308..6eae140 100644 --- a/ansible/roles/dc01/tasks/populate_ad.yaml +++ b/ansible/roles/dc01/tasks/populate_ad.yaml @@ -2,6 +2,6 @@ ansible.windows.win_powershell: script: C:\scripts\populate-ad.ps1 parameters: - DomainName: "{{ domain_name }}" + DomainName: "{{ main_domain_name }}" UserPassword: "{{ default_win_user_password }}" SvcPassword: "{{ default_win_svc_password }}" diff --git a/ansible/roles/dc01/tasks/set_hostname.yaml b/ansible/roles/dc01/tasks/set_hostname.yaml index 7cca168..73fa63c 100644 --- a/ansible/roles/dc01/tasks/set_hostname.yaml +++ b/ansible/roles/dc01/tasks/set_hostname.yaml @@ -1,2 +1,2 @@ - name: "{{ ansible_host }}: set hostname" - ansible.windows.win_shell: Rename-Computer -NewName "{{ hostname }}" -Force + ansible.windows.win_shell: Rename-Computer -NewName "{{ main_dc01_hostname }}" -Force diff --git a/ansible/roles/dc01/tasks/setup_domain.yaml b/ansible/roles/dc01/tasks/setup_domain.yaml index 43fcfc4..778c4db 100644 --- a/ansible/roles/dc01/tasks/setup_domain.yaml +++ b/ansible/roles/dc01/tasks/setup_domain.yaml @@ -2,5 +2,5 @@ ansible.windows.win_powershell: script: C:\scripts\setup-main-domain.ps1 parameters: - DomainName: "{{ domain_name }}" + DomainName: "{{ main_domain_name }}" SafeModePassword: "{{ default_win_safemode_password }}" diff --git a/ansible/roles/dc01/tasks/setup_gpo.yaml b/ansible/roles/dc01/tasks/setup_gpo.yaml index aa84237..53eb086 100644 --- a/ansible/roles/dc01/tasks/setup_gpo.yaml +++ b/ansible/roles/dc01/tasks/setup_gpo.yaml @@ -1,7 +1,7 @@ - name: "{{ ansible_host }}: execute setup-gpo.ps1 as domain admin" - ansible.windows.win_command: powershell.exe -ExecutionPolicy Bypass -File C:\scripts\setup-gpo.ps1 -DomainName "{{ domain_name }}" + ansible.windows.win_command: powershell.exe -ExecutionPolicy Bypass -File C:\scripts\setup-gpo.ps1 -DomainName "{{ main_domain_name }}" become: yes become_method: runas - become_user: "{{ domain_name }}\\Administrator" + become_user: "{{ main_domain_name }}\\Administrator" vars: ansible_become_password: "{{ default_win_password }}" diff --git a/ansible/roles/proxmox_vm/tasks/main.yaml b/ansible/roles/proxmox_vm/tasks/main.yaml index c6abe93..051e388 100644 --- a/ansible/roles/proxmox_vm/tasks/main.yaml +++ b/ansible/roles/proxmox_vm/tasks/main.yaml @@ -13,5 +13,5 @@ - name: set vm network configuration import_tasks: set_network.yaml -- name: upload files to vm - import_tasks: upload_files.yaml + #- name: upload files to vm + # import_tasks: upload_files.yaml diff --git a/ansible/roles/srv01/tasks/main.yaml b/ansible/roles/srv01/tasks/main.yaml index 06f6974..8b14503 100644 --- a/ansible/roles/srv01/tasks/main.yaml +++ b/ansible/roles/srv01/tasks/main.yaml @@ -4,11 +4,15 @@ port: "{{ ansible_port }}" timeout: 300 delegate_to: localhost - vars: - ansible_connection: local - name: set hostname import_tasks: set_hostname.yaml +- name: reboot after hostname change + import_tasks: reboot.yaml + - name: execute join-domain.sh import_tasks: join_domain.yaml + +- name: reboot after domain join + import_tasks: reboot.yaml |