Page MenuHomeDevCentral
Files F3942663

No OneTemporary
Actions

View Options

diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
index 9246f87..1ebdfcf 100644
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -1,95 +1,98 @@
# -------------------------------------------------------------
# Salt — Nodes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
nodes:
##
## Forest: Nasqueron
## Semantic field: https://devcentral.nasqueron.org/P27
##
dwellers:
forest: nasqueron-infra
hostname: dwellers.nasqueron.org
roles:
- paas-lxc
- paas-docker
- mastodon
network:
+ ipv4_address: 51.255.124.11
+ ipv4_gateway: 91.121.86.254
+
ipv6_tunnel: True
equatower:
forest: nasqueron-infra
hostname: equatower.nasqueron.org
roles:
- paas-docker
network:
ipv4_address: 51.255.124.10
ipv4_gateway: 91.121.86.254
ipv6_tunnel: True
ysul:
forest: nasqueron-dev
hostname: ysul.nasqueron.org
roles:
- devserver
- saltmaster
- dbserver-mysql
- webserver-legacy
zfs:
pool: arcology
network:
ipv4_interface: igb0
ipv4_address: 163.172.49.16
ipv4_gateway: 163.172.49.1
ipv4_aliases:
- 212.83.187.132
ipv6_tunnel: True
ipv6_gateway: 2001:470:1f12:9e1::1
windriver:
forest: nasqueron-dev
hostname: windriver.nasqueron.org
roles:
- devserver
- saltmaster
- dbserver-mysql
- webserver-legacy
zfs:
pool: arcology
network:
ipv4_interface: igb0
ipv4_address: 51.159.18.59
ipv4_gateway: 51.159.18.1
ipv6_interface: igb0
ipv6_address: 2001:0bc8:6005:0005:aa1e:84ff:fef3:5d9c
ipv6_prefix: 128
ipv6_native: True
ipv6_tunnel: False
##
## Forest: Eglide
## Semantic field: ? (P27 used for "Eglide" too)
##
## This forest is intended to separate credentials
## between Eglide and Nasqueron servers.
##
eglide:
forest: eglide
hostname: eglide.org
roles:
- shellserver
network:
ipv6_tunnel: True
fixes:
rsyslog_xconsole: True
diff --git a/roles/core/motd/files/dwellers b/roles/core/motd/files/dwellers
index f80e246..fa8152a 100644
--- a/roles/core/motd/files/dwellers
+++ b/roles/core/motd/files/dwellers
@@ -1,19 +1,19 @@
_____________________________________________________________
' ||'''|. '||` '||`
|| || || ||
|| || '\\ //` .|''|, || || .|''|, '||''| (''''
|| || \\/\// ||..|| || || ||..|| || `'')
.||...|' \/\/ `|... .||. .||. `|... .||. `...'
- IP: 51.255.124.11
- GW: 62.210.76.1
+ IP: {{ ipv4_address }}
+ GW: {{ ipv4_gateway }}
Containers for Nasqueron and associated projects.
Docker / LXC
Documentation: https://agora.nasqueron.org/Dwellers
Please report any action done on this server
to Freenode #nasqueron-ops or on DevCentral.
_____________________________________________________________
diff --git a/roles/core/motd/files/equatower b/roles/core/motd/files/equatower
index 15d9ba0..c4bcbb0 100644
--- a/roles/core/motd/files/equatower
+++ b/roles/core/motd/files/equatower
@@ -1,14 +1,14 @@
EQUATOWER ______
\ \
- A Nasqueron infra- \ \
- structure server. \ \_
+ A Nasqueron infra- \ \ IP: {{ ipv4_address }}
+ structure server. \ \_ GW: {{ ipv4_gateway }}
_\ \
PaaS Docker \ \
\ \_
- IP: 51.255.124.10 _\ \
- GW: 91.121.86.254 \ \
+ The containers hosted _\ \
+ here are in production. \ \
\ \_
- /// /// /// /// /// _\ \
+ /// /// /// /// /// /// _\ \
\ \
___________________________________\ \_________mic'03
diff --git a/roles/core/motd/init.sls b/roles/core/motd/init.sls
index 98f08ab..e9e5c12 100644
--- a/roles/core/motd/init.sls
+++ b/roles/core/motd/init.sls
@@ -1,26 +1,32 @@
# -------------------------------------------------------------
# Salt — MOTD
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% set network = salt['node.get']('network') %}
+
motd:
file.managed:
{% if grains['os_family'] == 'Debian' %}
- name: /etc/motd.tail
{% else %}
- name: /etc/motd
{% endif %}
- source: salt://roles/core/motd/files/{{ grains['id'] }}
+ - template: jinja
+ - context:
+ ipv4_address: {{ network['ipv4_address'] }}
+ ipv4_gateway: {{ network['ipv4_gateway'] }}
# Fixes T858
get_rid_of_scaleway_motd:
file.absent:
- name: /etc/update-motd.d/50-scw
/usr/local/bin/motd:
file.managed:
- source: salt://roles/core/motd/files/motd.sh
- mode: 755

File Metadata

Mime Type
text/x-diff
Expires
Thu, Dec 26, 19:27 (10 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2314041
Default Alt Text
(5 KB)

Event Timeline

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