diff options
| -rw-r--r-- | configure.yml | 1 | ||||
| -rw-r--r-- | host_vars/pve.local.yml | bin | 353 -> 365 bytes | |||
| -rw-r--r-- | host_vars/pve.local.yml.example | 3 | ||||
| -rw-r--r-- | molecule/proxmox/converge.yml | 2 | ||||
| -rw-r--r-- | roles/network/meta/argument_specs.yml | 4 | ||||
| -rw-r--r-- | roles/network/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/network/templates/bridge.nmconnection.j2 | 4 | ||||
| -rw-r--r-- | roles/network/templates/eth0-connection.nmconnection.j2 | 12 | ||||
| -rw-r--r-- | roles/pve-lxc/meta/main.yml | 1 |
9 files changed, 15 insertions, 16 deletions
diff --git a/configure.yml b/configure.yml index 8b1dae10..763bc406 100644 --- a/configure.yml +++ b/configure.yml @@ -132,7 +132,6 @@ pve_lxc_disk: "{{ hostvars[service_host].pve_lxc_disk }}" pve_lxc_cores: "{{ hostvars[service_host].pve_lxc_cores }}" pve_lxc_memory: "{{ hostvars[service_host].pve_lxc_memory }}" - pve_lxc_password: "{{ hostvars[service_host].pve_lxc_password }}" pve_lxc_ip: "{{ hostvars[service_host].pve_lxc_ip }}" pve_lxc_gateway: "{{ hostvars[service_host].pve_lxc_gateway }}" pve_lxc_dns: "{{ hostvars[service_host].pve_lxc_dns }}" diff --git a/host_vars/pve.local.yml b/host_vars/pve.local.yml Binary files differindex 02bacbe3..f9640566 100644 --- a/host_vars/pve.local.yml +++ b/host_vars/pve.local.yml diff --git a/host_vars/pve.local.yml.example b/host_vars/pve.local.yml.example index 7cda3a76..007962dc 100644 --- a/host_vars/pve.local.yml.example +++ b/host_vars/pve.local.yml.example @@ -2,12 +2,11 @@ network_ipv4_address: "10.0.0.253" network_ipv4_gateway: "10.0.0.254" network_ipv4_dns: "10.0.0.254" -network_bridge: "vmbr0" +network_bridge_interface: "enp0s25" pve_admin_user: "admin" pve_admin_password: "changeme" pve_storage_device: "/dev/sda4" -pve_storage_name: "pve" restic_version: "0.19.0" diff --git a/molecule/proxmox/converge.yml b/molecule/proxmox/converge.yml index 5e702109..e590d49d 100644 --- a/molecule/proxmox/converge.yml +++ b/molecule/proxmox/converge.yml @@ -45,7 +45,7 @@ password_store_repo_url: "https://github.com/octocat/Spoon-Knife" network_ipv4_address: "10.0.0.253" network_ipv4_gateway: "10.0.0.1" - network_bridge: "vmbr0" + network_bridge_interface: "eth0" pre_tasks: - name: "Override is_chroot fact for container environment" ansible.builtin.set_fact: diff --git a/roles/network/meta/argument_specs.yml b/roles/network/meta/argument_specs.yml index f85318a8..0c9f74fe 100644 --- a/roles/network/meta/argument_specs.yml +++ b/roles/network/meta/argument_specs.yml @@ -30,7 +30,7 @@ argument_specs: network_ipv6_dns: type: "str" description: "The network IP(4) gateway to configure when provided" - network_bridge: + network_bridge_interface: type: "str" - description: "Bridge interface name — when set, ethernet becomes bridge port and bridge connection is created" + description: "Physical NIC to enslave as vmbr0 bridge port" required: false diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 1268b3cd..967a0b30 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -106,11 +106,11 @@ - name: "Configure bridge connection" ansible.builtin.template: src: "bridge.nmconnection.j2" - dest: "/etc/NetworkManager/system-connections/{{ network_bridge }}.nmconnection" + dest: "/etc/NetworkManager/system-connections/vmbr0.nmconnection" mode: "0600" owner: "root" group: "root" - when: network_bridge is defined + when: network_bridge_interface is defined - name: "Configure wifi connection" ansible.builtin.template: diff --git a/roles/network/templates/bridge.nmconnection.j2 b/roles/network/templates/bridge.nmconnection.j2 index 2e8bf23c..013acd6a 100644 --- a/roles/network/templates/bridge.nmconnection.j2 +++ b/roles/network/templates/bridge.nmconnection.j2 @@ -1,7 +1,7 @@ [connection] -id={{ network_bridge }} +id=vmbr0 type=bridge -interface-name={{ network_bridge }} +interface-name=vmbr0 autoconnect=true [bridge] diff --git a/roles/network/templates/eth0-connection.nmconnection.j2 b/roles/network/templates/eth0-connection.nmconnection.j2 index 6a6481c4..d6deea34 100644 --- a/roles/network/templates/eth0-connection.nmconnection.j2 +++ b/roles/network/templates/eth0-connection.nmconnection.j2 @@ -2,16 +2,18 @@ id=ethernet type=ethernet autoconnect=true -{% if network_bridge is defined %} -controller={{ network_bridge }} -port-type=bridge +{% if network_bridge_interface is defined %} +interface-name={{ network_bridge_interface }} +# NOTE: master/slave-type keyfile keys deprecated in NM 1.46, replaced by controller/port-type +master=vmbr0 +slave-type=bridge {% endif %} [ethernet] cloned-mac-address=permanent [ipv4] -{% if network_bridge is defined %} +{% if network_bridge_interface is defined %} method=disabled {% elif network_ipv4_address is defined %} method=manual @@ -26,7 +28,7 @@ method=auto [ipv6] addr-gen-mode=default -{% if network_bridge is defined %} +{% if network_bridge_interface is defined %} method=disabled {% elif network_ipv6_address is defined %} method=manual diff --git a/roles/pve-lxc/meta/main.yml b/roles/pve-lxc/meta/main.yml index 82db1bad..f12e3e48 100644 --- a/roles/pve-lxc/meta/main.yml +++ b/roles/pve-lxc/meta/main.yml @@ -2,7 +2,6 @@ dependencies: - role: "proxmoxer" - role: "pve" - - role: "pve-network" galaxy_info: author: "a14m" description: "Provision an LXC container on Proxmox VE" |