Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3767201
D2641.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
15 KB
Referenced Files
None
Subscribers
None
D2641.diff
View Options
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -73,6 +73,14 @@
Support for contributors is provided on Freenode #nasqueron-ops.
+Inclusive terminology
+---------------------
+
+The repository uses the following terminology:
+
+ - **Salt primary server**: server that issues commands to other servers, including itself
+ - **Node**: a server, baremetal or VM configured by Salt
+
License
-------
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -44,7 +44,7 @@
hostname: complector.nasqueron.org
roles:
- vault
- - saltmaster
+ - salt-primary
zfs:
pool: zroot
network:
@@ -147,7 +147,7 @@
hostname: ysul.nasqueron.org
roles:
- devserver
- - saltmaster
+ - salt-primary
- dbserver-mysql
- webserver-legacy
zfs:
@@ -173,7 +173,7 @@
hostname: windriver.nasqueron.org
roles:
- devserver
- - saltmaster
+ - salt-primary
- dbserver-mysql
- webserver-legacy
zfs:
diff --git a/roles/core/motd/files/complector b/roles/core/motd/files/complector
--- a/roles/core/motd/files/complector
+++ b/roles/core/motd/files/complector
@@ -9,7 +9,7 @@
for Nasqueron servers infrastructure: o !o! !!| \/ \/ /
( * ( o!'; |\ \ /
- Vault o o ! * !` | \ / \
- - Salt master o | o 'o| | : \ /
+ - Salt o | o 'o| | : \ /
* o !*!': |o| / /
Access is restricted for deployment purpose (o''| `| : / /
to Nasqueron Operations SIG members. ! *|'` \|/ \\
diff --git a/roles/core/motd/files/windriver b/roles/core/motd/files/windriver
--- a/roles/core/motd/files/windriver
+++ b/roles/core/motd/files/windriver
@@ -3,9 +3,8 @@
\ \/ \/ / | '_ \ / _` |/ \// \ \ / / _ \ '__| a Nasqueron server.
\ /\ /| | | | | (_| / _ \ |\ V / __/ |
\/ \/ |_|_| |_|\__,_\/ \_/_| \_/ \___|_| Development | Staging area
- Management | Salt master
+ Management
[Haiku] Time forms the mountain. [News] 2019-11-22
Rain, wind, rivers, do their work. Server installed.
Shadows reveal depth. Tracking task: T1536
-
diff --git a/roles/core/motd/files/ysul b/roles/core/motd/files/ysul
--- a/roles/core/motd/files/ysul
+++ b/roles/core/motd/files/ysul
@@ -2,7 +2,7 @@
_ _
| / / Welcome to Y'sul, a Nasqueron server.
----|---/----__----------/-
- | / (_ ` / / / Development | Staging area | Salt master
+ | / (_ ` / / / Development | Staging area
____|_/____(__)_(___(__/__________________________________________________
/
(_ / “Any theory which causes solipsism to seem just as likely an
@@ -12,4 +12,3 @@
2017-10-20: Server has been reprovisioned. You can check the current
state & comment what you need @ https://devcentral.nasqueron.org/T1268
__________________________________________________________________________
-
diff --git a/roles/devserver/userland-home/repos.sls b/roles/devserver/userland-home/repos.sls
--- a/roles/devserver/userland-home/repos.sls
+++ b/roles/devserver/userland-home/repos.sls
@@ -23,7 +23,7 @@
- name: {{ repo['source'] }}
- target: {{ target }}
- update_head: False
- {% if salt['node.has_role']('saltmaster') %}
+ {% if salt['node.has_role']('salt-primary') %}
# TODO: find an alternative solution for other servers (suggest rSTAGING?)
- identity: /opt/salt/security/id_ed25519
{% endif %}
diff --git a/roles/paas-docker/wrappers/files/sentry.sh b/roles/paas-docker/wrappers/files/sentry.sh
--- a/roles/paas-docker/wrappers/files/sentry.sh
+++ b/roles/paas-docker/wrappers/files/sentry.sh
@@ -33,7 +33,7 @@
if [ ! -f "$DOCKER_RUN_SCRIPT" ]; then
echo "File doesn't exist: $DOCKER_RUN_SCRIPT" 1>&2;
- echo "You can generate it running 'deploy-container sentry' command on the Salt master. 1>&2;"
+ echo "You can generate it running 'deploy-container sentry' command on the Salt primary server. 1>&2;"
exit 4
fi
diff --git a/roles/saltmaster/account/files/deploy b/roles/salt-primary/account/files/deploy
rename from roles/saltmaster/account/files/deploy
rename to roles/salt-primary/account/files/deploy
--- a/roles/saltmaster/account/files/deploy
+++ b/roles/salt-primary/account/files/deploy
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Created: 2017-09-28
# License: Trivial work, not eligible to copyright
-# Source file: roles/saltmaster/account/files/deploy
+# Source file: roles/salt-primary/account/files/deploy
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/saltmaster/account/files/salt b/roles/salt-primary/account/files/salt
rename from roles/saltmaster/account/files/salt
rename to roles/salt-primary/account/files/salt
--- a/roles/saltmaster/account/files/salt
+++ b/roles/salt-primary/account/files/salt
@@ -4,7 +4,7 @@
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
-# Source file: roles/saltmaster/account/files/salt
+# Source file: roles/salt-primary/account/files/salt
# -------------------------------------------------------------
#
# <auto-generated>
@@ -18,3 +18,9 @@
%salt ALL=(salt) NOPASSWD: SALT
%salt ALL=(ALL) NOPASSWD: /usr/local/bin/salt-call
+
+# -------------------------------------------------------------
+# Disclaimer: FreeBSD port for Salt still uses "salt_master".
+# This service name is kept for compatibility,
+# but isn't an endorsement of such terminology.
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/saltmaster/account/init.sls b/roles/salt-primary/account/init.sls
rename from roles/saltmaster/account/init.sls
rename to roles/salt-primary/account/init.sls
--- a/roles/saltmaster/account/init.sls
+++ b/roles/salt-primary/account/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Salt master configuration
+# Salt — Salt configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-04-28
@@ -19,7 +19,7 @@
- gid: 9001
user.present:
- name: salt
- - fullname: SaltStack master account
+ - fullname: SaltStack primary server account
- uid: 9001
- gid: 9001
- home: /var/run/salt
@@ -78,8 +78,8 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% for sudofile in ['salt', 'deploy'] %}
-saltmaster_sudo_capabilities_{{ sudofile }}:
+salt_sudo_capabilities_{{ sudofile }}:
file.managed:
- name: {{ dirs.etc }}/sudoers.d/{{ sudofile }}
- - source: salt://roles/saltmaster/account/files/{{ sudofile }}
+ - source: salt://roles/salt-primary/account/files/{{ sudofile }}
{% endfor %}
diff --git a/roles/saltmaster/cloud/files/providers/dwellers b/roles/salt-primary/cloud/files/providers/dwellers
rename from roles/saltmaster/cloud/files/providers/dwellers
rename to roles/salt-primary/cloud/files/providers/dwellers
diff --git a/roles/saltmaster/cloud/init.sls b/roles/salt-primary/cloud/init.sls
rename from roles/saltmaster/cloud/init.sls
rename to roles/salt-primary/cloud/init.sls
--- a/roles/saltmaster/cloud/init.sls
+++ b/roles/salt-primary/cloud/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Salt master configuration
+# Salt — Salt configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-04-28
@@ -12,9 +12,9 @@
# Providers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-saltmaster_cloud_providers:
+salt_cloud_providers:
file.recurse:
- name: {{ dirs.etc }}/salt/cloud.providers.d
- - source: salt://roles/saltmaster/cloud/files/providers
+ - source: salt://roles/salt-primary/cloud/files/providers
- dir_mode: 755
- file_mode: 644
diff --git a/roles/saltmaster/init.sls b/roles/salt-primary/init.sls
rename from roles/saltmaster/init.sls
rename to roles/salt-primary/init.sls
--- a/roles/saltmaster/init.sls
+++ b/roles/salt-primary/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Provision a salt master
+# Salt — Provision a salt primary server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-21
diff --git a/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf b/roles/salt-primary/salt-wrapper/files/salt-wrapper.conf
rename from roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
rename to roles/salt-primary/salt-wrapper/files/salt-wrapper.conf
--- a/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
+++ b/roles/salt-primary/salt-wrapper/files/salt-wrapper.conf
@@ -5,7 +5,7 @@
"Changes to this file may cause incorrect behavior",
"and will be lost if the state is redeployed.",
- "Source file: roles/saltmaster/salt-wrapper/files/salt-wrapper.conf"
+ "Source file: roles/salt-primary/salt-wrapper/files/salt-wrapper.conf"
],
"roots": [
diff --git a/roles/saltmaster/salt-wrapper/init.sls b/roles/salt-primary/salt-wrapper/init.sls
rename from roles/saltmaster/salt-wrapper/init.sls
rename to roles/salt-primary/salt-wrapper/init.sls
--- a/roles/saltmaster/salt-wrapper/init.sls
+++ b/roles/salt-primary/salt-wrapper/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Salt master configuration
+# Salt — Salt configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-04
@@ -28,7 +28,7 @@
{{ dirs.etc }}/salt-wrapper.conf:
file.managed:
- - source: salt://roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
+ - source: salt://roles/salt-primary/salt-wrapper/files/salt-wrapper.conf
# -------------------------------------------------------------
# Wrapper manual
diff --git a/roles/saltmaster/service/files/rc.patch b/roles/salt-primary/service/files/rc.patch
rename from roles/saltmaster/service/files/rc.patch
rename to roles/salt-primary/service/files/rc.patch
diff --git a/roles/saltmaster/service/init.sls b/roles/salt-primary/service/init.sls
rename from roles/saltmaster/service/init.sls
rename to roles/salt-primary/service/init.sls
--- a/roles/saltmaster/service/init.sls
+++ b/roles/salt-primary/service/init.sls
@@ -9,14 +9,18 @@
{% from "map.jinja" import dirs, services with context %}
# -------------------------------------------------------------
-# rc :: ensure master runs in UTF-8
+# rc :: ensure primary service runs in UTF-8
+#
+# Disclaimer: FreeBSD port for Salt still uses "salt_master".
+# This service name is kept for compatibility,
+# but isn't an endorsement of such terminology.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if services['manager'] == "rc" %}
{{ dirs.etc }}/rc.d/salt_master:
file.patch:
- - source: salt://roles/saltmaster/service/files/rc.patch
+ - source: salt://roles/salt-primary/service/files/rc.patch
- hash: 08559af1d8b2d24f762085421a563602
{% endif %}
diff --git a/roles/saltmaster/software/files/staging-commit-message.py b/roles/salt-primary/software/files/staging-commit-message.py
rename from roles/saltmaster/software/files/staging-commit-message.py
rename to roles/salt-primary/software/files/staging-commit-message.py
diff --git a/roles/saltmaster/software/init.sls b/roles/salt-primary/software/init.sls
rename from roles/saltmaster/software/init.sls
rename to roles/salt-primary/software/init.sls
--- a/roles/saltmaster/software/init.sls
+++ b/roles/salt-primary/software/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Provision a salt master
+# Salt — Provision a salt primary server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-10-04
@@ -22,5 +22,5 @@
{{ dirs.bin }}/staging-commit-message:
file.managed:
- - source: salt://roles/saltmaster/software/files/staging-commit-message.py
+ - source: salt://roles/salt-primary/software/files/staging-commit-message.py
- mode: 755
diff --git a/roles/saltmaster/staging/init.sls b/roles/salt-primary/staging/init.sls
rename from roles/saltmaster/staging/init.sls
rename to roles/salt-primary/staging/init.sls
--- a/roles/saltmaster/staging/init.sls
+++ b/roles/salt-primary/staging/init.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Provision a salt master
+# Salt — Provision a salt primary server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-21
diff --git a/roles/saltmaster/zemke-rhyne/account.sls b/roles/salt-primary/zemke-rhyne/account.sls
rename from roles/saltmaster/zemke-rhyne/account.sls
rename to roles/salt-primary/zemke-rhyne/account.sls
diff --git a/roles/saltmaster/zemke-rhyne/data.sls b/roles/salt-primary/zemke-rhyne/data.sls
rename from roles/saltmaster/zemke-rhyne/data.sls
rename to roles/salt-primary/zemke-rhyne/data.sls
--- a/roles/saltmaster/zemke-rhyne/data.sls
+++ b/roles/salt-primary/zemke-rhyne/data.sls
@@ -13,7 +13,7 @@
{{ zr_home }}/data/servers.json:
file.managed:
- - source: salt://roles/saltmaster/zemke-rhyne/files/servers.json.jinja
+ - source: salt://roles/salt-primary/zemke-rhyne/files/servers.json.jinja
- template: jinja
- user: zr
diff --git a/roles/saltmaster/zemke-rhyne/files/dot.arcrc.json b/roles/salt-primary/zemke-rhyne/files/dot.arcrc.json
rename from roles/saltmaster/zemke-rhyne/files/dot.arcrc.json
rename to roles/salt-primary/zemke-rhyne/files/dot.arcrc.json
diff --git a/roles/saltmaster/zemke-rhyne/files/servers.json.jinja b/roles/salt-primary/zemke-rhyne/files/servers.json.jinja
rename from roles/saltmaster/zemke-rhyne/files/servers.json.jinja
rename to roles/salt-primary/zemke-rhyne/files/servers.json.jinja
diff --git a/roles/saltmaster/zemke-rhyne/init.sls b/roles/salt-primary/zemke-rhyne/init.sls
rename from roles/saltmaster/zemke-rhyne/init.sls
rename to roles/salt-primary/zemke-rhyne/init.sls
diff --git a/roles/saltmaster/zemke-rhyne/software.sls b/roles/salt-primary/zemke-rhyne/software.sls
rename from roles/saltmaster/zemke-rhyne/software.sls
rename to roles/salt-primary/zemke-rhyne/software.sls
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -11,7 +11,7 @@
- roles/core
- roles/webserver-content
'local':
- - roles/saltmaster
+ - roles/salt-primary
'ysul':
- roles/builder
- roles/dbserver-mysql
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 23, 22:58 (19 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259103
Default Alt Text
D2641.diff (15 KB)
Attached To
Mode
D2641: Adopt salt-primary role name
Attached
Detach File
Event Timeline
Log In to Comment