From d53a00ed58a109e667c60ea52322814cc9ea9f5d Mon Sep 17 00:00:00 2001 From: abrown38 Date: Wed, 22 Jan 2025 14:04:03 +0000 Subject: [PATCH 1/6] new tag for updating cmk hosts --- ansible/playbooks/checkmk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/playbooks/checkmk.yml b/ansible/playbooks/checkmk.yml index f48be32..f07baf5 100644 --- a/ansible/playbooks/checkmk.yml +++ b/ansible/playbooks/checkmk.yml @@ -42,6 +42,7 @@ notify: "activate changes" tags: - checkmk_host + - checkmk_host_update - checkmk_all - name: Move Proxy to project specific checkmk folder From 64535624036d7553ce5b339aefa0338d3b0a3bbd Mon Sep 17 00:00:00 2001 From: abrown38 Date: Wed, 22 Jan 2025 14:04:59 +0000 Subject: [PATCH 2/6] variable volume size --- ansible/playbooks/openstack-vms.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/playbooks/openstack-vms.yml b/ansible/playbooks/openstack-vms.yml index feef99a..ae303da 100644 --- a/ansible/playbooks/openstack-vms.yml +++ b/ansible/playbooks/openstack-vms.yml @@ -20,7 +20,7 @@ flavor: "{{ user_vm_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -55,7 +55,7 @@ flavor: "{{ user_vm_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -96,7 +96,7 @@ flavor: "{{ user_vm_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -131,7 +131,7 @@ flavor: "{{ user_vm_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -172,7 +172,7 @@ flavor: "{{ gpu_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -207,7 +207,7 @@ flavor: "{{ gpu_flavor }}" timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -250,7 +250,7 @@ flavor: "{{ server_vm_flavor }}" timeout: 3600 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" terminate_volume: yes security_groups: - domain_member @@ -293,7 +293,7 @@ flavor: 3661211f-673a-4777-8857-fd243d6c407d timeout: 900 boot_from_volume: true - volume_size: 40 + volume_size: "{{ vm_vol_size }}" # probably change to lower fixed number terminate_volume: yes key_name: proxy security_groups: From b81d36bc9c12053aa5e6a21faa6bcebc84d5f054 Mon Sep 17 00:00:00 2001 From: abrown38 Date: Wed, 22 Jan 2025 14:05:31 +0000 Subject: [PATCH 3/6] differen volume sizes for each server type --- ansible/playbooks/openstack-volumes.yml | 4 ++-- ansible/vars/common.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/openstack-volumes.yml b/ansible/playbooks/openstack-volumes.yml index 51ac4cb..a5023d6 100644 --- a/ansible/playbooks/openstack-volumes.yml +++ b/ansible/playbooks/openstack-volumes.yml @@ -7,8 +7,8 @@ volumes: - { vol_name: "{{ os_project }}-{{ win_project }}-fs01", vol_size: "{{ fs_vol_size }}", vm_name: "fs01" } - { vol_name: "{{ os_project }}-{{ win_project }}-fs02", vol_size: "{{ fs_vol_size }}", vm_name: "fs02" } - - { vol_name: "{{ os_project }}-{{ win_project }}-choc", vol_size: "{{ regular_vol_size }}", vm_name: "choc" } - - { vol_name: "{{ os_project }}-{{ win_project }}-wsus", vol_size: "{{ regular_vol_size }}", vm_name: "wsus" } + - { vol_name: "{{ os_project }}-{{ win_project }}-choc", vol_size: "{{ choc_vol_size }}", vm_name: "choc" } + - { vol_name: "{{ os_project }}-{{ win_project }}-wsus", vol_size: "{{ wsus_vol_size }}", vm_name: "wsus" } - { vol_name: "{{ os_project }}-{{ win_project }}-File_Transfer", vol_size: "{{ regular_vol_size }}", vm_name: "fs01" } tasks: diff --git a/ansible/vars/common.yml b/ansible/vars/common.yml index 6760b6e..90c6cc7 100644 --- a/ansible/vars/common.yml +++ b/ansible/vars/common.yml @@ -2,6 +2,9 @@ os_project: %OS_PROJECT% win_project: %WIN_PROJECT% fs_vol_size: %FS_VOL_SIZE% +choc_vol_size: %CHOC_VOL_SIZE% +wsus_vol_size: %WSUS_VOL_SIZE% +vm_vol_size: %VM_VOL_SIZE% wb_quantity: %WB_QUANTITY% app_quantity: %APP_QUANTITY% gpu_quantity: %GPU_QUANTITY% From 09f28bfa460479d66d7a1f632bf7d4bb442b0458 Mon Sep 17 00:00:00 2001 From: abrown38 Date: Wed, 22 Jan 2025 14:05:46 +0000 Subject: [PATCH 4/6] add tags to proxy VM --- ansible/roles/win_proxy/tasks/checkmk.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/win_proxy/tasks/checkmk.yml b/ansible/roles/win_proxy/tasks/checkmk.yml index 4f92a11..9d72afb 100644 --- a/ansible/roles/win_proxy/tasks/checkmk.yml +++ b/ansible/roles/win_proxy/tasks/checkmk.yml @@ -23,6 +23,8 @@ name: "{{ inventory_hostname }}" attributes: ipaddress: "{{ hostvars[inventory_hostname].ansible_host }}" + tag_Variant: "{{ hostvars[inventory_hostname].openstack.metadata.variant }}" + tag_project_zone: "{{ project_zone }}" state: "present" register: host_added notify: "activate changes" @@ -38,6 +40,8 @@ name: "{{ inventory_hostname }}" attributes: ipaddress: "{{ hostvars[inventory_hostname].ansible_host }}" + tag_Variant: "{{ hostvars[inventory_hostname].openstack.metadata.variant }}" + tag_project_zone: "{{ project_zone }}" state: "present" register: host_added notify: "activate changes" From baeb9af985c2b91ddb2bffdfb3337db43dff33e0 Mon Sep 17 00:00:00 2001 From: abrown38 Date: Wed, 22 Jan 2025 14:06:12 +0000 Subject: [PATCH 5/6] basic script WIP --- password_gen.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 password_gen.sh diff --git a/password_gen.sh b/password_gen.sh new file mode 100644 index 0000000..d54081c --- /dev/null +++ b/password_gen.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +declare -g PASSWORD="" +declare -gr WORDLIST="/usr/share/dict/words-custom" + +END=4 +for ((i=1;i<=END;i++)); do + LINE=$(($RANDOM + 1)) + WORD=$(sed $LINE!d $WORDLIST) + PASSWORD+="${WORD}-" +done + +PASSWORD+=$RANDOM +printf "$PASSWORD" \ No newline at end of file From 21199a8395644c6bbdf1276f6fa414650ccb80a5 Mon Sep 17 00:00:00 2001 From: abrown38 Date: Mon, 27 Jan 2025 11:24:32 +0000 Subject: [PATCH 6/6] fix flavor id --- ansible/vars/common.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/vars/common.yml b/ansible/vars/common.yml index 90c6cc7..8941f6f 100644 --- a/ansible/vars/common.yml +++ b/ansible/vars/common.yml @@ -15,8 +15,8 @@ vm_initial_password: %VM_INITIAL_PASSWORD% vm_image: 3f193ea7-321d-418b-a233-da64661b08b1 proxy_image: 62669efd-ee43-4148-848c-b82f49ca2f45 server_vm_flavor: 3661211f-673a-4777-8857-fd243d6c407d -user_vm_flavor: 3661211f-673a-4777-8857-fd243d6c407d -#user_vm_flavor: a82596d8-175b-45d2-b7db-d1658b3dd643 +#user_vm_flavor: 3661211f-673a-4777-8857-fd243d6c407d +user_vm_flavor: a82596d8-175b-45d2-b7db-d1658b3dd643 gpu_flavor: b07fc115-e48e-4289-b220-baae18c8db8a filetransfer_user: file-transfer