Page MenuHomeDevCentral
Files F3781243

D2869.diff
No OneTemporary
Actions

D2869.diff
View Options

diff --git a/roles/salt-primary/config/files/pillar-tower.conf b/roles/salt-primary/config/files/pillar-tower.conf
new file mode 100644
--- /dev/null
+++ b/roles/salt-primary/config/files/pillar-tower.conf
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------
+# SaltStack deployment
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/salt-primary/config/files/pillar-tower.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+ext_pillar:
+ - tower: /opt/salt/nasqueron-operations/pillar/tower.sls
diff --git a/roles/salt-primary/config/init.sls b/roles/salt-primary/config/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/salt-primary/config/init.sls
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------
+# Salt — Salt configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% from "map.jinja" import dirs with context %}
+
+# -------------------------------------------------------------
+# Providers
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.etc }}/salt/master.d/pillar-tower.conf:
+ file.managed:
+ - source: salt://roles/salt-primary/config/files/pillar-tower.conf
+ - file_mode: 644
diff --git a/roles/salt-primary/init.sls b/roles/salt-primary/init.sls
--- a/roles/salt-primary/init.sls
+++ b/roles/salt-primary/init.sls
@@ -8,6 +8,7 @@
include:
- .software
+ - .config
- .account
- .cloud
- .staging
diff --git a/roles/salt-primary/software/init.sls b/roles/salt-primary/software/init.sls
--- a/roles/salt-primary/software/init.sls
+++ b/roles/salt-primary/software/init.sls
@@ -19,6 +19,8 @@
- {{ packages_prefixes.python3 }}python-jenkins
# For staging-commit-message
- {{ packages_prefixes.python3 }}gitpython
+ # Pillar
+ - {{ packages_prefixes.python3 }}salt-tower
# Utilities
- colordiff

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 19:20 (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2265013
Default Alt Text
D2869.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator