Page MenuHomeDevCentral
Files F3766483

D3032.id7741.diff
No OneTemporary
Actions

D3032.id7741.diff
View Options

diff --git a/_modules/node.py b/_modules/node.py
--- a/_modules/node.py
+++ b/_modules/node.py
@@ -14,6 +14,15 @@
from salt._compat import ipaddress
+DEPLOY_ROLES = [
+ "devserver",
+ "salt-primary",
+ "viperserv",
+ "webserver-alkane",
+ "webserver-legacy",
+]
+
+
def _get_all_nodes():
return __pillar__.get("nodes", {})
@@ -176,6 +185,13 @@
return filtered_list
+def has_deployment(nodename=None):
+ """
+ A function to determine if this server does continuous delivery.
+ """
+ return any(role in DEPLOY_ROLES for role in get_list("roles", nodename))
+
+
def has_web_content(content, nodename=None):
return content in filter_by_role("web_content_sls", nodename)
diff --git a/roles/core/deploy/init.sls b/roles/core/deploy/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/core/deploy/init.sls
@@ -0,0 +1,19 @@
+# -------------------------------------------------------------
+# Salt — Deploy user
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if salt["node.has_deployment"]() %}
+
+# Deployment account
+deploy_account:
+ user.present:
+ - name: deploy
+ - fullname: Deployment and management of the Salt staging area
+ - uid: 9002
+ - gid: 3003
+ - home: /var/run/deploy
+
+{% endif %}
diff --git a/roles/core/init.sls b/roles/core/init.sls
--- a/roles/core/init.sls
+++ b/roles/core/init.sls
@@ -8,6 +8,7 @@
include:
- .rc
- .certificates
+ - .deploy
- .hostname
- .login
- .network
diff --git a/roles/salt-primary/account/init.sls b/roles/salt-primary/account/init.sls
--- a/roles/salt-primary/account/init.sls
+++ b/roles/salt-primary/account/init.sls
@@ -30,15 +30,6 @@
- onchanges:
- user: salt_account
-# Deployment account
-deploy_account:
- user.present:
- - name: deploy
- - fullname: Deployment and management of the Salt staging area
- - uid: 9002
- - gid: 3003
- - home: /var/run/deploy
-
# -------------------------------------------------------------
# Directories
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 18:26 (14 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258656
Default Alt Text
D3032.id7741.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