Merge branch 'volume-sizes' into eidfsp04

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

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: 

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:

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"

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%
@@ -12,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

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"