Page MenuHomeDevCentral
Files F35051732

D4113.diff
No OneTemporary
Actions

D4113.diff
View Options

diff --git a/pillar/core/salt.sls b/pillar/core/salt.sls
new file mode 100644
--- /dev/null
+++ b/pillar/core/salt.sls
@@ -0,0 +1,6 @@
+# -------------------------------------------------------------
+# Salt — Salt configuration for all nodes
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+# Used to pin version for installations through Broadcom repository
+salt_version: 3006.26
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -11,6 +11,7 @@
- core.groups
- core.network
- core.ntp
+ - core.salt
- nodes.nodes
- nodes.forests
- hotfixes.roles
diff --git a/roles/core/userland-software/files/sources/salt-pin-1001 b/roles/core/userland-software/files/sources/salt-pin-1001
new file mode 100644
--- /dev/null
+++ b/roles/core/userland-software/files/sources/salt-pin-1001
@@ -0,0 +1,19 @@
+# -------------------------------------------------------------
+# Debian packages
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/core/userland-software/files/sources/salt-pin-1001
+# -------------------------------------------------------------
+#
+# <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>
+# -------------------------------------------------------------
+
+Package: salt-*
+Pin: version {{ version }}
+Pin-Priority: 1001
diff --git a/roles/core/userland-software/sources.sls b/roles/core/userland-software/sources.sls
--- a/roles/core/userland-software/sources.sls
+++ b/roles/core/userland-software/sources.sls
@@ -62,6 +62,13 @@
- name: apt update
- onchanges:
- file: /etc/apt/sources.list
+
+/etc/apt/preferences.d/salt-pin-1001:
+ file.managed:
+ - source: salt://roles/core/userland-software/files/sources/salt-pin-1001
+ - template: jinja
+ - context:
+ version: {{ pillar["salt_version"] }}
{% endif %}
# -------------------------------------------------------------

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 7, 07:45 (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3902172
Default Alt Text
D4113.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