diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-01-10 19:24:08 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-01-10 19:24:08 +0100 |
| commit | 08ddb8aaeec3a2ff4e3d2b58beb02b6466bc0d9d (patch) | |
| tree | 09aeb11679795176eaa7440415a0fd876012bd54 | |
| parent | collabora code: upgrade o.skillz.biz (diff) | |
add mac address parameter for vm network
fix ssh host key cleanup script
| -rw-r--r-- | inventory/host_vars/ch-testvm.yml | 1 | ||||
| -rwxr-xr-x | remove-known-host.sh | 4 | ||||
| -rw-r--r-- | roles/vm/define/templates/libvirt-domain.xml.j2 | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm.yml index 29ed1e14..73702a95 100644 --- a/inventory/host_vars/ch-testvm.yml +++ b/inventory/host_vars/ch-testvm.yml @@ -18,6 +18,7 @@ install: interfaces: - bridge: br-public name: primary0 + mac: 52:54:00:42:e6:df autostart: False network: diff --git a/remove-known-host.sh b/remove-known-host.sh index 04ead3e5..aab40144 100755 --- a/remove-known-host.sh +++ b/remove-known-host.sh @@ -8,6 +8,8 @@ fi short="$1" ssh_host=$(ssh -G "$short" | grep "^hostname " | awk '{ print($2) }' ) ssh_port=$(ssh -G "$short" | grep "^port " | awk '{ print($2) }' ) +known_hosts_file=$(ssh -G "$short" | grep "^userknownhostsfile " | awk '{ print($2) }' ) +known_hosts_file=${known_hosts_file/#\~/$HOME} cd "${BASH_SOURCE%/*}" source common/utils.sh @@ -16,7 +18,7 @@ ansible_variable__get host_domain "$short" || exit 1 for name in "$short" "$ssh_host" "$ssh_host:$ssh_port" "[$ssh_host]:$ssh_port" "$host_name" "$host_name.$host_domain"; do - ssh-keygen -f "$HOME/.ssh/known_hosts" -R "$name" + ssh-keygen -f "$known_hosts_file" -R "$name" done exit 0 diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2 index 2a2e4388..780d1bae 100644 --- a/roles/vm/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/define/templates/libvirt-domain.xml.j2 @@ -82,6 +82,9 @@ {% if hostvars[hostname].install_cooked.interfaces %} {% for if in hostvars[hostname].install_cooked.interfaces %} <interface type='bridge'> +{% if 'mac' in if %} + <mac address='{{ if.mac }}'/> +{% endif %} <source bridge='{{ if.bridge }}'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x0{{ loop.index }}' function='0x0'/> |