Page MenuHomeDevCentral
Files F3802848

D2217.diff
No OneTemporary
Actions

D2217.diff
View Options

diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -21,6 +21,9 @@
- paas-docker
- mastodon
network:
+ ipv4_address: 51.255.124.11
+ ipv4_gateway: 91.121.86.254
+
ipv6_tunnel: True
equatower:
diff --git a/roles/core/motd/files/dwellers b/roles/core/motd/files/dwellers
--- a/roles/core/motd/files/dwellers
+++ b/roles/core/motd/files/dwellers
@@ -6,8 +6,8 @@
|| || \\/\// ||..|| || || ||..|| || `'')
.||...|' \/\/ `|... .||. .||. `|... .||. `...'
- IP: 51.255.124.11
- GW: 62.210.76.1
+ IP: {{ ipv4_address }}
+ GW: {{ ipv4_gateway }}
Containers for Nasqueron and associated projects.
diff --git a/roles/core/motd/files/equatower b/roles/core/motd/files/equatower
--- 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
--- a/roles/core/motd/init.sls
+++ b/roles/core/motd/init.sls
@@ -6,6 +6,8 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% set network = salt['node.get']('network') %}
+
motd:
file.managed:
{% if grains['os_family'] == 'Debian' %}
@@ -14,6 +16,10 @@
- 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 Metadata

Mime Type
text/plain
Expires
Sat, Nov 30, 12:36 (21 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2272961
Default Alt Text
D2217.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