From 7bc78918370805c004a9b2b38516869700a5e68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Sat, 24 Aug 2024 14:56:10 +0200 Subject: [PATCH] Add vars include to linroom, winroom --- linsetup.yml | 10 +++++++--- roles/BMO-63259/meta/main.yml | 2 +- roles/PA-63737/meta/main.yml | 2 +- roles/twincat3/meta/main.yml | 4 ++++ roles/twincat3/tasks/main.yml | 4 ++++ roles/twincat3/tasks/main_lin.yml | 2 ++ roles/twincat3/tasks/main_win.yml | 5 +++++ roles/visualstudio19/tasks/main.yml | 4 ++++ roles/visualstudio19/tasks/main_lin.yml | 2 ++ roles/visualstudio19/tasks/main_win.yml | 5 +++++ winsetup.yml | 12 +++++++++++- 11 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 roles/twincat3/meta/main.yml create mode 100644 roles/twincat3/tasks/main.yml create mode 100644 roles/twincat3/tasks/main_lin.yml create mode 100644 roles/twincat3/tasks/main_win.yml create mode 100644 roles/visualstudio19/tasks/main.yml create mode 100644 roles/visualstudio19/tasks/main_lin.yml create mode 100644 roles/visualstudio19/tasks/main_win.yml diff --git a/linsetup.yml b/linsetup.yml index b99b561..071f086 100644 --- a/linsetup.yml +++ b/linsetup.yml @@ -3,8 +3,12 @@ become: true vars: ansible_port: 1001 - ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' - ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' + # ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' + # ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' ansible_connection: 'ssh' + vars_files: + - vars/credentials.yml + - vars/software_keys.yml roles: - - all_classes + # - all_classes + - fri_base diff --git a/roles/BMO-63259/meta/main.yml b/roles/BMO-63259/meta/main.yml index 31928ec..8a62826 100644 --- a/roles/BMO-63259/meta/main.yml +++ b/roles/BMO-63259/meta/main.yml @@ -3,4 +3,4 @@ # Windows, VMware Workstation 16.2.4 Player, wireshark dependencies: - role: wireshark - - role: vmware_player + - role: virtualbox diff --git a/roles/PA-63737/meta/main.yml b/roles/PA-63737/meta/main.yml index f42edd6..e81f483 100644 --- a/roles/PA-63737/meta/main.yml +++ b/roles/PA-63737/meta/main.yml @@ -2,4 +2,4 @@ # Nejc.Ilc@fri.uni-lj.si # Windows, VMware Workstation 16.2.4 Player dependencies: - - role: vmware_player + - role: twincat3 diff --git a/roles/twincat3/meta/main.yml b/roles/twincat3/meta/main.yml new file mode 100644 index 0000000..3d28cc7 --- /dev/null +++ b/roles/twincat3/meta/main.yml @@ -0,0 +1,4 @@ +# dependencies: +# - role: fri_base +dependencies: + - role: visualstudio19 diff --git a/roles/twincat3/tasks/main.yml b/roles/twincat3/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/twincat3/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/twincat3/tasks/main_lin.yml b/roles/twincat3/tasks/main_lin.yml new file mode 100644 index 0000000..996ec5c --- /dev/null +++ b/roles/twincat3/tasks/main_lin.yml @@ -0,0 +1,2 @@ +- name: Do not install TwinCat 3 on Linux + debug: Do not install TwinCat 3 on Linux diff --git a/roles/twincat3/tasks/main_win.yml b/roles/twincat3/tasks/main_win.yml new file mode 100644 index 0000000..c2ec314 --- /dev/null +++ b/roles/twincat3/tasks/main_win.yml @@ -0,0 +1,5 @@ +- name: Install TwinCat 3 + win_chocolatey: + name: visualstudio2019community + +# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version diff --git a/roles/visualstudio19/tasks/main.yml b/roles/visualstudio19/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/visualstudio19/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/visualstudio19/tasks/main_lin.yml b/roles/visualstudio19/tasks/main_lin.yml new file mode 100644 index 0000000..54a5121 --- /dev/null +++ b/roles/visualstudio19/tasks/main_lin.yml @@ -0,0 +1,2 @@ +- name: Do not install VisualStudio on Linux + debug: Do not install VisualStudio on Linux diff --git a/roles/visualstudio19/tasks/main_win.yml b/roles/visualstudio19/tasks/main_win.yml new file mode 100644 index 0000000..ef292c4 --- /dev/null +++ b/roles/visualstudio19/tasks/main_win.yml @@ -0,0 +1,5 @@ +- name: Install Microsoft Visual Studio 2019 + win_chocolatey: + name: visualstudio2019community + +# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version diff --git a/winsetup.yml b/winsetup.yml index 0226c6d..e6091ec 100644 --- a/winsetup.yml +++ b/winsetup.yml @@ -1,6 +1,7 @@ - hosts: classroom become: true become_method: runas + debugger: on_failed vars: ansible_connection: winrm ansible_winrm_transport: ntlm @@ -8,6 +9,15 @@ ansible_port: 5985 logon_type: interactive installers: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install + vars_files: + - vars/credentials.yml + - vars/software_keys.yml roles: - - all_classes + # - fri_base + - matlab + # - all_classes + # - android_studio + # - octave + # - audacity + # - vmware_player