Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion roles/dhcp-server/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
eth_local_ip_address: 10.20.0.1/24
eth_local_ip_address: 10.20.0.1
eth_local_ip_netmask: 24

eth_local_mac_address: 00:00:00:00:00:01
eth_uplink_mac_address: 00:00:00:00:00:02
Expand Down
2 changes: 1 addition & 1 deletion roles/dhcp-server/templates/interfaces-dhcp.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ iface lo inet loopback

auto eth-local
iface eth-local inet static
address {{ eth_local_ip_address }}
address {{ eth_local_ip_address }}/{{ eth_local_ip_netmask }}
pre-up ethtool -K $IFACE gso off gro off tso off || true

auto eth-uplink
Expand Down
2 changes: 1 addition & 1 deletion roles/dhcp-server/templates/interfaces-static.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ iface lo inet loopback

auto eth-local
iface eth-local inet static
address {{ eth_local_ip_address }}
address {{ eth_local_ip_address }}/{{ eth_local_ip_netmask }}
pre-up ethtool -K $IFACE gso off gro off tso off || true

auto eth-uplink
Expand Down
9 changes: 7 additions & 2 deletions roles/nfs-server/templates/exports.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# {{ ansible_managed }}
# fsid=X is needed for XFS filesystems with 64bit inodes
/srv/{{ nfs_server }}/veyepar {{ eth_local_ip_address|default(ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) }}(ro,sync,no_subtree_check,fsid=0)
/srv/{{ nfs_server }}/video {{ eth_local_ip_address|default(ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) }}(rw,sync,no_subtree_check,fsid=1)
{% if eth_local_ip_address is defined %}
/srv/{{ nfs_server }}/veyepar {{ eth_local_ip_address }}/{{ eth_local_ip_netmask }}(ro,sync,no_subtree_check,fsid=0)
/srv/{{ nfs_server }}/video {{ eth_local_ip_address }}/{{ eth_local_ip_netmask }}(rw,sync,no_subtree_check,fsid=1)
{% else %}
/srv/{{ nfs_server }}/veyepar {{ default(ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) }}(ro,sync,no_subtree_check,fsid=0)
/srv/{{ nfs_server }}/video {{ default(ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) }}(rw,sync,no_subtree_check,fsid=1)
{% endif %}