D2570.id6493.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2570.id6493.diff
View Options

	diff --git a/roles/core/network/files/FreeBSD/netif_ipv4.rc b/roles/core/network/files/FreeBSD/netif_ipv4.rc
	--- a/roles/core/network/files/FreeBSD/netif_ipv4.rc
	+++ b/roles/core/network/files/FreeBSD/netif_ipv4.rc
	@@ -13,11 +13,7 @@
	# and will be lost if the state is redeployed.
	# </auto-generated>

	-{% if dhcp_required %}
	-ifconfig_{{ interface }}="DHCP"
	-{%- else -%}
	ifconfig_{{ interface }}="inet {{ ipv4_address }} netmask {{ ipv4_netmask }}"
	-{% endif -%}
	{%- for ip in ipv4_aliases %}
	ifconfig_{{ interface }}_alias{{ loop.index0 }}="inet {{ ip }} netmask 255.255.255.255"
	{% endfor -%}
	diff --git a/roles/core/network/ipv4.sls b/roles/core/network/ipv4.sls
	--- a/roles/core/network/ipv4.sls
	+++ b/roles/core/network/ipv4.sls
	@@ -23,7 +23,6 @@
	ipv4_address: {{ network['ipv4_address'] }}
	ipv4_netmask: {{ network['ipv4_netmask'] \| default('255.255.255.0') }}
	ipv4_aliases: {{ salt['node.get_list']('network:ipv4_aliases') }}
	- dhcp_required: {{ salt['node.has']('network:dhcp_required') }}
	{% endif %}

	# -------------------------------------------------------------
	diff --git a/roles/core/network/private.sls b/roles/core/network/private.sls
	--- a/roles/core/network/private.sls
	+++ b/roles/core/network/private.sls
	@@ -26,7 +26,6 @@
	ipv4_address: {{ interface['address'] }}
	ipv4_netmask: {{ interface['netmask'] \| default('255.255.255.0') }}
	ipv4_aliases: {{ salt['node.get_list']('network:private_interface:aliases') }}
	- dhcp_required: False
	{% endif %}

	{% if grains['os_family'] == 'RedHat' %}