diff --git a/host_vars/cavall.yml b/host_vars/cavall.yml index cf4baba..3b36fe3 100644 --- a/host_vars/cavall.yml +++ b/host_vars/cavall.yml @@ -1,8 +1,8 @@ # vim: ft=yaml.ansible # code: language=ansible --- -ansible_host: 85.209.118.134 # TODO: Change to DNS name -ansible_port: 22 - hostname: "{{ inventory_hostname }}" fqdn: "{{ hostname }}.servers.data.coop" + +ansible_host: "{{ fqdn }}" +ansible_port: 22 diff --git a/host_vars/folald.yml b/host_vars/folald.yml index d211e33..e0033c3 100644 --- a/host_vars/folald.yml +++ b/host_vars/folald.yml @@ -1,12 +1,12 @@ # vim: ft=yaml.ansible # code: language=ansible --- -ansible_host: 85.209.118.134 # TODO: Change to DNS name -ansible_port: 19022 - -internal_ipv4: 10.2.1.5 -vm_host: cavall -vm_type: control - hostname: "{{ inventory_hostname }}" fqdn: "{{ hostname }}.vm.{{ vm_host }}.servers.data.coop" + +ansible_host: "{{ fqdn }}" +ansible_port: 19022 +internal_ipv4: 10.2.1.5 + +vm_host: cavall +vm_type: control diff --git a/host_vars/hestur.yml b/host_vars/hestur.yml index 803d890..807c6ca 100644 --- a/host_vars/hestur.yml +++ b/host_vars/hestur.yml @@ -1,11 +1,11 @@ # vim: ft=yaml.ansible # code: language=ansible --- -ansible_host: 159.223.17.241 # TODO: Change to DNS name +hostname: "{{ inventory_hostname }}" +fqdn: "{{ hostname }}.vm.{{ vm_host }}.servers.data.coop" + +ansible_host: "{{ fqdn }}" ansible_port: 22 vm_host: cloud vm_type: uptime - -hostname: "{{ inventory_hostname }}" -fqdn: "{{ hostname }}.vm.{{ vm_host }}.servers.data.coop" diff --git a/host_vars/poltre.yml b/host_vars/poltre.yml index 6eb40fa..9eba9d8 100644 --- a/host_vars/poltre.yml +++ b/host_vars/poltre.yml @@ -1,12 +1,12 @@ # vim: ft=yaml.ansible # code: language=ansible --- -ansible_host: 85.209.118.142 # TODO: Change to DNS name -ansible_port: 19022 - -internal_ipv4: 10.2.1.2 -vm_host: cavall -vm_type: app - hostname: "{{ inventory_hostname }}" fqdn: "{{ hostname }}.vm.{{ vm_host }}.servers.data.coop" + +ansible_host: "{{ fqdn }}" +ansible_port: 19022 +internal_ipv4: 10.2.1.2 + +vm_host: cavall +vm_type: app diff --git a/host_vars/varsa.yml b/host_vars/varsa.yml index 1c553cf..4c2825a 100644 --- a/host_vars/varsa.yml +++ b/host_vars/varsa.yml @@ -1,12 +1,12 @@ # vim: ft=yaml.ansible # code: language=ansible --- -ansible_host: 85.209.118.143 # TODO: Change to DNS name -ansible_port: 19022 - -internal_ipv4: 10.2.1.3 -vm_host: cavall -vm_type: app - hostname: "{{ inventory_hostname }}" fqdn: "{{ hostname }}.vm.{{ vm_host }}.servers.data.coop" + +ansible_host: "{{ fqdn }}" +ansible_port: 19022 +internal_ipv4: 10.2.1.3 + +vm_host: cavall +vm_type: app diff --git a/proxmox/etc/network/interfaces b/proxmox/etc/network/interfaces index 99dc401..502e103 100644 --- a/proxmox/etc/network/interfaces +++ b/proxmox/etc/network/interfaces @@ -59,7 +59,7 @@ iface vmbr2 inet static #NAT bridge for VMs that need masquerading post-up echo 1 > /proc/sys/net/ipv4/ip_forward - post-up iptables -t nat -A POSTROUTING -s '192.168.1.0/24' -o bond0 -j MASQUERADE - post-down iptables -t nat -D POSTROUTING -s '192.168.1.0/24' -o bond0 -j MASQUERADE + post-up iptables -t nat -A POSTROUTING -s '192.168.1.0/24' -o vmbr0 -j MASQUERADE + post-down iptables -t nat -D POSTROUTING -s '192.168.1.0/24' -o vmbr0 -j MASQUERADE source /etc/network/interfaces.d/* \ No newline at end of file