Page MenuHomeDevCentral
Files F12242859

No OneTemporary
Actions

View Options

diff --git a/pillar/core/network.sls b/pillar/core/network.sls
index fe5aa42..b0c31a5 100644
--- a/pillar/core/network.sls
+++ b/pillar/core/network.sls
@@ -1,19 +1,28 @@
networks:
drake:
netmask: 255.255.255.0
addr:
+ cloudhugger: 172.27.27.28
windriver: 172.27.27.27
ysul: 172.27.27.33
gre_tunnels:
windriver:
+ wind-cloud:
+ interface: gre0
+ network: drake
+ to: cloudhugger
+
wind-ysul:
interface: gre0
network: drake
to: ysul
ysul:
- wind-ysul:
+ wind-ysul: &gre_drake_to_windriver
interface: gre0
network: drake
to: windriver
+
+ cloudhugger:
+ wind-cloud: *gre_drake_to_windriver
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
index a10e94d..9590059 100644
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -1,101 +1,119 @@
# -------------------------------------------------------------
# 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
##
+ cloudhugger:
+ forest: nasqueron-infra
+ hostname: cloudhugger.nasqueron.org
+ roles:
+ - paas-kubernetes
+ network:
+ ipv4_interface: eno1
+ ipv4_address: 188.165.200.229
+ ipv4_gateway: 188.165.200.254
+
+ ipv6_interface: eno1
+ ipv6_address: fe80::ec4:7aff:fe6a:36e8
+ ipv6_gateway: fe80::ee30:91ff:fee0:df80
+ ipv6_prefix: 64
+ ipv6_native: True
+
+ ipv6_tunnel: False
+
dwellers:
forest: nasqueron-infra
hostname: dwellers.nasqueron.org
roles:
- paas-lxc
- paas-docker
- mastodon
flags:
install_docker_devel_tools: True
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_gateway: fe80::a293:51ff:feb7:5073
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/pillar/top.sls b/pillar/top.sls
index b5c6967..eb9d3e8 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,48 +1,50 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- core.users
- core.groups
- core.network
- certificates.certificates
- nodes.nodes
- nodes.forests
- hotfixes.roles
- webserver.sites
+ cloudhugger: []
+
dwellers:
- credentials.zr
- paas.docker
- saas.sentry
eglide:
- shellserver.quassel
equatower:
- credentials.zr
- paas.docker
- saas.jenkins
- saas.phpbb
- saas.sentry
ysul:
- devserver.repos
- paas.docker
- saas.mediawiki
- viperserv.bots
- viperserv.fantoir
- webserver.labs
- webserver.wwwroot51
windriver:
- devserver.ports
- devserver.repos
- webserver.labs
- webserver.wwwroot51
diff --git a/roles/core/motd/files/cloudhugger b/roles/core/motd/files/cloudhugger
new file mode 100644
index 0000000..22bce97
--- /dev/null
+++ b/roles/core/motd/files/cloudhugger
@@ -0,0 +1,13 @@
+ _
+ (` ). _
+ ( ). / .:(` )`. CloudHugger
+) _( '`. | :( . )
+ .=(`( . ) / .-- `. ( ) ) Nasqueron infrastructure
+ (( (..__.:'-' /.+( ) ` _` ) ) Production / Debian 10
+`. `( ) ) / ( . ) ( ) ._
+ ) ` __.:' ) | ( ( )) `-'.-(` ) Kubernetes master
+) ) ( ) --' \ `- __.' :( )) Kuma
+.-' (_.' .') `( ) )) Elastic (OpenDistro)
+ (_ ) ` __.:'
+ /!\ Only use kubectl
+--..,___.--,--'`,---..-.--+--.,,-,,..._.--..-._.-a:f--.
diff --git a/top.sls b/top.sls
index 905e23b..dac23b3 100644
--- a/top.sls
+++ b/top.sls
@@ -1,36 +1,38 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- roles/core
- roles/webserver-content
'local':
- roles/saltmaster
'ysul':
- roles/builder
- roles/dbserver-mysql
- roles/devserver
- roles/viperserv
- roles/webserver-core
- roles/webserver-legacy
- roles/webserver-varnish
'windriver':
- roles/builder
- roles/dbserver-mysql
- roles/devserver
- roles/webserver-core
- roles/webserver-legacy
+ 'cloudhugger':
+ - roles/paas-kubernetes
'dwellers':
- roles/paas-docker/docker
- roles/paas-lxc/lxc
'eglide':
- roles/webserver-core
- roles/shellserver
'equatower':
- roles/paas-docker

File Metadata

Mime Type
text/x-diff
Expires
Sun, Oct 12, 10:44 (2 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3065784
Default Alt Text
(6 KB)

Event Timeline

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