From 89eaa4b28d47aeaeaad4197dfc9b420b3bb7b56a Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Thu, 26 Sep 2024 15:24:47 +0100
Subject: [PATCH] use variable for remoting setup script

---
 ansible/playbooks/openstack-vms.yml | 14 +++++++-------
 ansible/vars/common.yml             |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ansible/playbooks/openstack-vms.yml b/ansible/playbooks/openstack-vms.yml
index c02e9e6..7733d27 100644
--- a/ansible/playbooks/openstack-vms.yml
+++ b/ansible/playbooks/openstack-vms.yml
@@ -30,7 +30,7 @@
           Rename-Computer "{{ win_project }}-wb{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(wb_quantity)|list}}"
       async: 900
       poll: 0
@@ -65,7 +65,7 @@
           Rename-Computer "{{ win_project }}-wb{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(wb_quantity)|list}}"
       when: 'async_wb.skipped == true'
 
@@ -106,7 +106,7 @@
           Rename-Computer "{{ win_project }}-app{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(app_quantity)|list}}"
       async: 900
       poll: 0
@@ -141,7 +141,7 @@
           Rename-Computer "{{ win_project }}-app{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(app_quantity)|list}}"
       when: 'async_app.skipped == true'
 
@@ -182,7 +182,7 @@
           Rename-Computer "{{ win_project }}-gpu{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(gpu_quantity)|list}}"
       async: 900
       poll: 0
@@ -217,7 +217,7 @@
           Rename-Computer "{{ win_project }}-gpu{{ '%02d' | format(item+1) }}"
           $admin = [adsi]("WinNT://./Administrator, user")
           $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+          Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
       loop: "{{ range(gpu_quantity)|list}}"
       when: 'async_gpu.skipped == true'
 
@@ -260,7 +260,7 @@
               Rename-Computer "{{ win_project }}-{{ item.meta_name }}"
               $admin = [adsi]("WinNT://./Administrator, user")
               $admin.PSBase.Invoke("SetPassword", "{{ vm_initial_password }}")
-              Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('https://raw.githubusercontent.com/ansible/ansible-documentation/devel/examples/scripts/ConfigureRemotingForAnsible.ps1'))
+              Invoke-Expression ((New-Object System.Net.Webclient).DownloadString('{{ winrm_script_url }}'))
           loop: "{{ standard_vms }}"
           async: 900
           poll: 0
diff --git a/ansible/vars/common.yml b/ansible/vars/common.yml
index ab1533a..94fb796 100644
--- a/ansible/vars/common.yml
+++ b/ansible/vars/common.yml
@@ -18,6 +18,8 @@ gpu_flavor: b07fc115-e48e-4289-b220-baae18c8db8a
 filetransfer_user: file-transfer
 filemanager_user: file-manager
 
+winrm_script_url: http://10.24.3.242/ConfigureRemotingForAnsible.ps1
+
 standard_vms:
   - { name: "{{ os_project }}-{{ win_project }}-dc01", security_group: "domain_controller", meta_name: dc01 }
   - { name: "{{ os_project }}-{{ win_project }}-dc02", security_group: "domain_controller", meta_name: dc02 }