diff --git a/host_vars/bbb.xitq.de b/host_vars/bbb.xitq.de index 5fdbd2a..95d1f59 100644 --- a/host_vars/bbb.xitq.de +++ b/host_vars/bbb.xitq.de @@ -21,10 +21,13 @@ libvirt_pool_dir: "/var/lib/libvirt/images" vm_base_image: template2204.qcow2 vm_base_image_archiv: "{{ vm_base_image + '.gz' }}" -# bobby -password: $6$A7Sw5gku7$0WqY/Z4Ei0axG.mZwDQlFJfK8Rtx6H0eKuP8CW23V5f/5j9sXendknLtXexQfgDzA4Ri55ZqhJnpf05MJV71J0 +# bobby $6$A7Sw5gku7$0WqY/Z4Ei0axG.mZwDQlFJfK8Rtx6H0eKuP8CW23V5f/5j9sXendknLtXexQfgDzA4Ri55ZqhJnpf05MJV71J0 +# Passwort für root ist bobby, muss hier im KLartext angegeben werden +password: bobby + +# root hat kein keypair, nur ein .ssh Verzeichnis mit hohgeladener authorized_keys Datei +# ssh_key_root: /root/.ssh/id_rsa.pub -ssh_key_root: /root/.ssh/id_rsa.pub ssh_key_core: /home/core/.ssh/id_rsa.pub vm_name: vhosttst vm_vcpus: 2 diff --git a/roles/bs_scripte/tasks/main.yml b/roles/bs_scripte/tasks/main.yml index 298986d..3e8faf8 100644 --- a/roles/bs_scripte/tasks/main.yml +++ b/roles/bs_scripte/tasks/main.yml @@ -45,13 +45,6 @@ group: users mode: 0755 -- name: Upload restart libvirt to core's Scripte directory - copy: - src: restart_libvirt - dest: /home/core/Scripte/ - owner: core - group: users - mode: 0755 - name: Install vim for script editing apt: diff --git a/roles/bs_scripte/files/restart_libvirt b/roles/kvm_install/files/libvirt_restart similarity index 100% rename from roles/bs_scripte/files/restart_libvirt rename to roles/kvm_install/files/libvirt_restart diff --git a/roles/kvm_install/files/vhost_getIPv4 b/roles/kvm_install/files/vhost_getIPv4 new file mode 100644 index 0000000..0357166 --- /dev/null +++ b/roles/kvm_install/files/vhost_getIPv4 @@ -0,0 +1,20 @@ +#!/bin/bash + +# ACHTUNG +# Dieses Script funktioneirt nur, wenn die VM läuft oder zumindest vor kurzem gelaufen hat. +# Vor kurzem bedeutet hier zu einem Zeitpunkt, der NACH des letzten flush des ARP-buffers liegt. + +#echo working on vhost $1 ,,, + +mac=`/home/core/Scripte/vhost_getMAC $1` +#echo found MAC $mac for vhost $1 + +buf=`/usr/sbin/arp -an | grep $mac` +#echo arp reports ipv4 config for MAC $mac is:$buf + +# Die IPv4-Adresse steht in der Ausgabe von arp in runden Klammern. +# Das sind auch die einziegen runden Klammern in der Asugabe. +buf=${buf#*(} +buf=${buf%)*} + +echo $buf diff --git a/roles/kvm_install/files/vhost_getMAC b/roles/kvm_install/files/vhost_getMAC new file mode 100644 index 0000000..4940b9d --- /dev/null +++ b/roles/kvm_install/files/vhost_getMAC @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/bin/virsh dumpxml $1 | grep "mac address" | awk -F\' '{ print $2}' \ No newline at end of file diff --git a/roles/kvm_install/tasks/main.yml b/roles/kvm_install/tasks/main.yml new file mode 100644 index 0000000..f308023 --- /dev/null +++ b/roles/kvm_install/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- import_tasks: packages_install.yml +- import_tasks: script_upload.yml +# - import_tasks: tomcatlib_upload.yml + + + +... \ No newline at end of file diff --git a/roles/kvm_setup/tasks/main.yml b/roles/kvm_install/tasks/packages_install.yml similarity index 85% rename from roles/kvm_setup/tasks/main.yml rename to roles/kvm_install/tasks/packages_install.yml index ea9c670..8c71f0e 100644 --- a/roles/kvm_setup/tasks/main.yml +++ b/roles/kvm_install/tasks/packages_install.yml @@ -33,22 +33,13 @@ append: "true" # Dieses Verzeichnis muss existieren, denn die VMs versuchen das ins lokale Filesystem zu mappen +# Macht auch nix wenns in anderen Kontexten nicht gebraucht wird, dann muss man nur eine XML-Konfig bereitstellen - name: Create tomcatlib directory ansible.builtin.file: path: /var/tomcatlib state: directory mode: '0755' -# Das muss hier raus -- name: Upload Tomcat Libs - copy: - src: "{{ item }}" - dest: /var/tomcatlib - owner: root - mode: '0644' - with_fileglob: - - /var/tomcatlib/*.jar - # Dieses Verzeichnis muss existieren, denn die VMs versuchen das ins lokale Filesystem zu mappen - name: Create fontlib directory ansible.builtin.file: diff --git a/roles/kvm_install/tasks/script_upload.yml b/roles/kvm_install/tasks/script_upload.yml new file mode 100644 index 0000000..a2cfc6c --- /dev/null +++ b/roles/kvm_install/tasks/script_upload.yml @@ -0,0 +1,27 @@ +--- + +- name: Upload libvirt_restart to core's Scripte directory + copy: + src: libvirt_restart + dest: /home/core/Scripte/ + owner: core + group: users + mode: 0755 + +- name: Upload vhost_getMAC to core's Scripte directory + copy: + src: vhost_getMAC + dest: /home/core/Scripte/ + owner: core + group: users + mode: 0755 + +- name: Upload vhost_getIPv4 to core's Scripte directory + copy: + src: vhost_getIPv4 + dest: /home/core/Scripte/ + owner: core + group: users + mode: 0755 +... +... \ No newline at end of file diff --git a/roles/kvm_install/tasks/tomcatlib_upload.yml b/roles/kvm_install/tasks/tomcatlib_upload.yml new file mode 100644 index 0000000..b3ebab6 --- /dev/null +++ b/roles/kvm_install/tasks/tomcatlib_upload.yml @@ -0,0 +1,13 @@ +--- + +# Das muss verbessert werden, so werden die jars JEDESMAL beim Aufruf hochgeladen. +- name: Upload Tomcat Libs + copy: + src: "{{ item }}" + dest: /var/tomcatlib + owner: root + mode: '0644' + with_fileglob: + - /var/tomcatlib/*.jar + +... \ No newline at end of file diff --git a/bootstrapTest.yml b/setupBBBworker.yml similarity index 81% rename from bootstrapTest.yml rename to setupBBBworker.yml index 8c38ef4..0aad94d 100644 --- a/bootstrapTest.yml +++ b/setupBBBworker.yml @@ -3,7 +3,7 @@ remote_user: core become: true roles: - # - kvm_setup + # - kvm_install - kvm_installvm diff --git a/setupKVMwirt.yml b/setupKVMwirt.yml new file mode 100644 index 0000000..3051325 --- /dev/null +++ b/setupKVMwirt.yml @@ -0,0 +1,10 @@ +--- +- hosts: "{{ target }}" + remote_user: core + become: true + roles: + - kvm_install + #- kvm_installvm + + +... \ No newline at end of file