Page MenuHomeDevCentral

D1270.id.diff
No OneTemporary

D1270.id.diff

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?

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 18:30 (13 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2312979
Default Alt Text
D1270.id.diff (924 B)

Event Timeline