cleaned up vars

1 files changed, 23 insertions, 32 deletions

diff --git a/ansible/group_vars/all/main.yaml b/ansible/group_vars/all/main.yaml
index 353eef5..2087d15 100644
--- a/ansible/group_vars/all/main.yaml
+++ b/ansible/group_vars/all/main.yaml
@@ -1,9 +1,11 @@
+# proxmox connection details, ssh must be enabled
 proxmox_hostname                : "{{ lookup('ansible.builtin.env', 'proxmox_hostname') }}"
 proxmox_username                : "{{ lookup('ansible.builtin.env', 'proxmox_username') }}"
 proxmox_api_token_id            : "{{ lookup('ansible.builtin.env', 'proxmox_api_token_id') }}"
 proxmox_api_token_secret        : "{{ lookup('ansible.builtin.env', 'proxmox_api_token_secret') }}"
 proxmox_node                    : "{{ lookup('ansible.builtin.env', 'proxmox_node') }}"
 
+# default local credentials for linux and windows
 default_win_username            : "{{ lookup('ansible.builtin.env', 'windows_username') }}"
 default_win_password            : "{{ lookup('ansible.builtin.env', 'windows_password') }}"
 default_win_safemode_password   : "{{ lookup('ansible.builtin.env', 'windows_safemode_password') }}"
@@ -13,48 +15,37 @@ default_win_svc_password        : "{{ lookup('ansible.builtin.env', 'windows_svc
 default_linux_username          : "{{ lookup('ansible.builtin.env', 'linux_username') }}"
 default_linux_password          : "{{ lookup('ansible.builtin.env', 'linux_password') }}"
 
-windows_server_qcow_image       : "{{ lookup('ansible.builtin.env', 'windows_server_qcow_image') }}"
-linux_server_qcow_image         : "{{ lookup('ansible.builtin.env', 'linux_server_qcow_image') }}"
-
+# proxmox vm and template details
 windows_server_template_id      : "{{ lookup('ansible.builtin.env', 'windows_server_template_id') }}"
 windows_server_template_name    : "{{ lookup('ansible.builtin.env', 'windows_server_template_name') }}"
-windows_desktop_template_id     : "{{ lookup('ansible.builtin.env', 'windows_desktop_template_id') }}"
-windows_desktop_template_name   : "{{ lookup('ansible.builtin.env', 'windows_desktop_template_name') }}"
 linux_server_template_id        : "{{ lookup('ansible.builtin.env', 'linux_server_template_id') }}"
 linux_server_template_name      : "{{ lookup('ansible.builtin.env', 'linux_server_template_name') }}"
-kali_template_id                : "{{ lookup('ansible.builtin.env', 'kali_template_id') }}"
-kali_template_name              : "{{ lookup('ansible.builtin.env', 'kali_template_name') }}"
 
+# domain details
 main_domain_name                : "{{ lookup('ansible.builtin.env', 'main_domain_name') }}"
-tree_domain_name                : "{{ lookup('ansible.builtin.env', 'tree_domain_name') }}"
-child_domain_name               : "{{ lookup('ansible.builtin.env', 'child_domain_name') }}"
-main_dc01_hostname              : "{{ lookup('ansible.builtin.env', 'main_dc01_hostname') }}" 
+
 main_dc01_vmid                  : "{{ lookup('ansible.builtin.env', 'main_dc01_vmid') }}" 
-tree_dc02_hostname              : "{{ lookup('ansible.builtin.env', 'tree_dc02_hostname') }}" 
+main_dc01_hostname              : "{{ lookup('ansible.builtin.env', 'main_dc01_hostname') }}" 
+main_dc01_ip_address            : "{{ lookup('ansible.builtin.env', 'main_dc01_ip_address') }}"
+
 tree_dc02_vmid                  : "{{ lookup('ansible.builtin.env', 'tree_dc02_vmid') }}" 
-child_dc03_hostname             : "{{ lookup('ansible.builtin.env', 'child_dc03_hostname') }}" 
+tree_dc02_hostname              : "{{ lookup('ansible.builtin.env', 'tree_dc02_hostname') }}" 
+tree_dc02_ip_address            : "{{ lookup('ansible.builtin.env', 'tree_dc02_ip_address') }}"
+
 child_dc03_vmid                 : "{{ lookup('ansible.builtin.env', 'child_dc03_vmid') }}" 
-main_websql01_hostname          : "{{ lookup('ansible.builtin.env', 'main_websql01_hostname') }}"
-main_websql01_vmid              : "{{ lookup('ansible.builtin.env', 'main_websql01_vmid') }}"
-    #main_mssql02_hostname           : "{{ lookup('ansible.builtin.env', 'main_mssql02_hostname') }}"
-    #main_mssql02_vmid               : "{{ lookup('ansible.builtin.env', 'main_mssql02_vmid') }}"
-main_web01_hostname             : "{{ lookup('ansible.builtin.env', 'main_web01_hostname') }}"
-main_web01_vmid                 : "{{ lookup('ansible.builtin.env', 'main_web01_vmid') }}"
-main_adcs01_hostname            : "{{ lookup('ansible.builtin.env', 'main_adcs01_hostname') }}"
-main_adcs01_vmid                : "{{ lookup('ansible.builtin.env', 'main_adcs01_vmid') }}"
-main_linux_srv01_hostname       : "{{ lookup('ansible.builtin.env', 'main_linux_srv01_hostname') }}"
+child_dc03_hostname             : "{{ lookup('ansible.builtin.env', 'child_dc03_hostname') }}" 
+child_dc03_ip_address           : "{{ lookup('ansible.builtin.env', 'child_dc03_ip_address') }}"
+
 main_linux_srv01_vmid           : "{{ lookup('ansible.builtin.env', 'main_linux_srv01_vmid') }}"
-kali_attackbox_hostname         : "{{ lookup('ansible.builtin.env', 'kali_attackbox_hostname') }}"
-kali_attackbox_vmid             : "{{ lookup('ansible.builtin.env', 'kali_attackbox_vmid') }}"
+main_linux_srv01_hostname       : "{{ lookup('ansible.builtin.env', 'main_linux_srv01_hostname') }}"
+main_linux_srv01_ip_address     : "{{ lookup('ansible.builtin.env', 'main_linux_srv01_ip_address') }}"
 
-main_dc01_ip_address            : "{{ lookup('ansible.builtin.env', 'main_dc01_ip_address') }}"
-tree_dc02_ip_address            : "{{ lookup('ansible.builtin.env', 'tree_dc02_ip_address') }}"
-child_dc03_ip_address           : "{{ lookup('ansible.builtin.env', 'child_dc03_ip_address') }}"
-main_websql01_ip_address        : "{{ lookup('ansible.builtin.env', 'main_websql01_ip_address') }}"
-    #main_mssql02_ip_address         : "{{ lookup('ansible.builtin.env', 'main_mssql02_ip_address') }}"
-main_web01_ip_address           : "{{ lookup('ansible.builtin.env', 'main_web01_ip_address') }}"
+main_adcs01_vmid                : "{{ lookup('ansible.builtin.env', 'main_adcs01_vmid') }}"
+main_adcs01_hostname            : "{{ lookup('ansible.builtin.env', 'main_adcs01_hostname') }}"
 main_adcs01_ip_address          : "{{ lookup('ansible.builtin.env', 'main_adcs01_ip_address') }}"
-main_workstation01_ip_address   : "{{ lookup('ansible.builtin.env', 'main_workstation01_ip_address') }}"
-main_linux_srv01_ip_address     : "{{ lookup('ansible.builtin.env', 'main_linux_srv01_ip_address') }}"
-kali_attackbox_ip_address       : "{{ lookup('ansible.builtin.env', 'kali_attackbox_ip_address') }}"
+
+main_websql01_vmid              : "{{ lookup('ansible.builtin.env', 'main_websql01_vmid') }}"
+main_websql01_hostname          : "{{ lookup('ansible.builtin.env', 'main_websql01_hostname') }}"
+main_websql01_ip_address        : "{{ lookup('ansible.builtin.env', 'main_websql01_ip_address') }}"
+
 network_gateway                 : "{{ lookup('ansible.builtin.env', 'network_gateway') }}"