D1270.diff
No OneTemporary
Actions

Size

924 B

Referenced Files

None

Subscribers

None

D1270.diff
View Options

	diff --git a/pillar/core/hostnames.sls b/pillar/core/hostnames.sls
	deleted file mode 100644
	--- a/pillar/core/hostnames.sls
	+++ /dev/null
	@@ -1,4 +0,0 @@
	-hostnames:
	- eglide: eglide.org
	- equatower: equatower.nasqueron.org
	- ysul: ysul.nasqueron.org
	diff --git a/pillar/top.sls b/pillar/top.sls
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -8,7 +8,6 @@

	base:
	'*':
	- - core.hostnames
	- core.users
	- core.groups
	- certificates.certificates
	diff --git a/roles/core/hostname/init.sls b/roles/core/hostname/init.sls
	--- a/roles/core/hostname/init.sls
	+++ b/roles/core/hostname/init.sls
	@@ -14,7 +14,7 @@
	hostname:
	file.managed:
	- name: /etc/hostname
	- - contents: {{ pillar.get('hostnames')[grains['id']] }}
	+ - contents: {{ salt['node.get']('hostname') }}

	# -------------------------------------------------------------
	# When the hostname is changed, what to run afterwards?