D1423.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1423.diff
View Options

	diff --git a/_modules/node.py b/_modules/node.py
	--- a/_modules/node.py
	+++ b/_modules/node.py
	@@ -77,7 +77,7 @@
	return default_value


	-def list(key, nodename=None):
	+def get_list(key, nodename=None):
	'''
	A function to get a node pillar configuration.

	@@ -114,7 +114,7 @@

	salt * node.has_role devserver
	'''
	- return role in list('roles', nodename)
	+ return role in get_list('roles', nodename)


	def filter_by_role(pillar_key, nodename=None):
	@@ -134,7 +134,7 @@

	salt * node.filter_by_role web_content_sls
	'''
	- roles = list('roles', nodename)
	+ roles = get_list('roles', nodename)
	dictionary = __pillar__.get(pillar_key, {})
	filtered_list = []

	diff --git a/roles/core/network/init.sls b/roles/core/network/init.sls
	--- a/roles/core/network/init.sls
	+++ b/roles/core/network/init.sls
	@@ -24,7 +24,7 @@
	interface: {{ network['ipv4_interface'] }}
	ipv4_address: {{ network['ipv4_address'] }}
	ipv4_netmask: {{ network['ipv4_netmask'] \| default('255.255.255.0') }}
	- ipv4_aliases: {{ salt['node.list']('network:ipv4_aliases') }}
	+ ipv4_aliases: {{ salt['node.get_list']('network:ipv4_aliases') }}
	dhcp_required: {{ salt['node.has']('network:dhcp_required') }}

	/etc/rc.conf.d/routing:
	diff --git a/roles/core/salt/init.sls b/roles/core/salt/init.sls
	--- a/roles/core/salt/init.sls
	+++ b/roles/core/salt/init.sls
	@@ -9,4 +9,4 @@
	salt_roles:
	grains.list_present:
	- name: roles
	- - value: {{ salt['node.list']("roles") }}
	+ - value: {{ salt['node.get_list']("roles") }}