D1075.id2746.diff
No OneTemporary
Actions

Size

999 B

Referenced Files

None

Subscribers

None

D1075.id2746.diff
View Options

	diff --git a/pillar/salt/roles.sls b/pillar/salt/roles.sls
	deleted file mode 100644
	--- a/pillar/salt/roles.sls
	+++ /dev/null
	@@ -1,15 +0,0 @@
	-roles:
	- eglide:
	- - shellserver
	- dwellers.nasqueron.org:
	- - paas-lxc
	- - paas-docker
	- ysul.nasqueron.org:
	- - devserver
	- - saltmaster
	- mail.nasqueron.org:
	- - mailserver
	- ns1.nasqueron.org:
	- - dns
	- ns2.nasqueron.org:
	- - dns
	diff --git a/pillar/top.sls b/pillar/top.sls
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -11,7 +11,6 @@
	- core.hostnames
	- certificates.certificates
	- nodes.nodes
	- - salt.roles
	eglide:
	- users.revokedusers
	- users.shellusers
	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: {{ pillar.get('roles')[grains['id']] }}
	+ - value: {{ salt['pillar.get']("nodes:" + grains['id'] + ":roles", []) }}