Page MenuHomeDevCentral
Files F12242409

No OneTemporary
Actions

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
index 0000000..409c4ff
--- /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
index 0000000..ea41128
--- /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
index 3593ae8..c6f05a4 100644
--- a/roles/salt-primary/init.sls
+++ b/roles/salt-primary/init.sls
@@ -1,14 +1,15 @@
# -------------------------------------------------------------
# Salt — Provision a salt primary server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-21
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- .software
+ - .config
- .account
- .cloud
- .staging
- .salt-wrapper
diff --git a/roles/salt-primary/software/init.sls b/roles/salt-primary/software/init.sls
index fe3e870..bd6c2a1 100644
--- a/roles/salt-primary/software/init.sls
+++ b/roles/salt-primary/software/init.sls
@@ -1,28 +1,30 @@
# -------------------------------------------------------------
# Salt — Provision a salt primary server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-10-04
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs, packages_prefixes with context %}
# -------------------------------------------------------------
# Additional software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
install_salt_primary_extra_software:
pkg.installed:
- pkgs:
# Jenkins execution module
- {{ packages_prefixes.python3 }}python-jenkins
# For staging-commit-message
- {{ packages_prefixes.python3 }}gitpython
+ # Pillar
+ - {{ packages_prefixes.python3 }}salt-tower
# Utilities
- colordiff
{{ dirs.bin }}/staging-commit-message:
file.managed:
- source: salt://roles/salt-primary/software/files/staging-commit-message.py
- mode: 755

File Metadata

Mime Type
text/x-diff
Expires
Sun, Oct 12, 08:56 (5 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3065576
Default Alt Text
(3 KB)

Event Timeline

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