Page MenuHomeDevCentral
Files F3766396

No OneTemporary
Actions

View Options

diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
index b4c8b5c..748b69f 100644
--- a/pillar/credentials/zr.sls
+++ b/pillar/credentials/zr.sls
@@ -1,128 +1,122 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-09-12
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Zemke-Rhyne credentials
#
# Map K<id> on DevCentral with hierarchical keys
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
zr_credentials:
#
# Credentials used by Nasqueron services
#
nasqueron:
# login.nasqueron.org
auth-grove:
mysql: 67
# status.nasqueron.org
cachet:
mysql: 47
app_key: 126
# pad.nasqueron.org
etherpad:
# This API key is used by Wolfplex API to access to the pad lists
api: 125
# notifications.nasqueron.org
notifications:
broker: 56
mailgun: 82
sentry: 141
# OpenSearch clusters
opensearch:
infra-logs:
internal_users:
admin: 163
dashboards: 164
# photos.nasqueron.org
pixelfed:
mysql: 142
app_key: 143
mailgun: 145
# sentry.nasqueron.org
sentry:
postgresql: 139
app_key: 140
#
# Credentials used by Nasqueron members private services
#
dereckson:
# River Sector
phabricator:
mysql: 133
#
# Credentials used by Espace Win services
#
espacewin:
# bugzilla.espace-win.org
bugzilla:
mysql: 131
#
# Credentials used by Wolfplex services
#
wolfplex:
# phabricator.wolfplex.be
phabricator:
mysql: 135
mailgun: 138
#
# Credentials used by Zed services
#
zed:
# code.zed.dereckson.be
phabricator:
mysql: 134
sendgrid: 45
# -------------------------------------------------------------
# Zemke-Rhyne clients
#
# This section should list all the Docker engines server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
zr_clients:
- key: 2
allowedConnectionFrom:
- 172.27.26.49
- dwellers.nasqueron.drake
- dwellers.nasqueron.org
restrictCommand:
comment: Zemke-Rhyne
- key: 162
allowedConnectionFrom:
- cloudhugger.nasqueron.org
restrictCommand:
comment: Zemke-Rhyne
-
- - key: 152
- allowedConnectionFrom:
- - docker-001.nasqueron.org
- restrictCommand:
- comment: Zemke-Rhyne
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
index 324a997..a22565a 100644
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -1,277 +1,249 @@
# -------------------------------------------------------------
# Salt — Nodes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
nodes_aliases:
netmasks:
intranought: &intranought_netmask 255.255.255.240
nodes:
##
## Forest: Nasqueron
## Semantic field: https://devcentral.nasqueron.org/P27
##
cloudhugger:
forest: nasqueron-infra
hostname: cloudhugger.nasqueron.org
roles:
- opensearch
network:
ipv6_native: True
ipv6_tunnel: False
canonical_public_ipv4: 188.165.200.229
interfaces:
eno1:
device: eno1
ipv4:
address: 188.165.200.229
gateway: 188.165.200.254
ipv6:
address: fe80::ec4:7aff:fe6a:36e8
prefix: 64
gateway: fe80::ee30:91ff:fee0:df80
complector:
forest: nasqueron-infra
hostname: complector.nasqueron.org
roles:
- vault
- salt-primary
zfs:
pool: zroot
network:
ipv6_tunnel: False
interfaces:
intranought:
device: vmx0
ipv4:
address: 172.27.27.7
netmask: *intranought_netmask
gateway: 172.27.27.1
db-A-001:
forest: nasqueron-infra
hostname: db-A-001.nasqueron.drake
roles:
- dbserver-pgsql
zfs:
pool: arcology
dbserver:
cluster: A
network:
ipv6_tunnel: False
interfaces:
intranought:
device: vmx0
ipv4:
address: 172.27.27.8
netmask: *intranought_netmask
gateway: 172.27.27.1
dwellers:
forest: nasqueron-dev-docker
hostname: dwellers.nasqueron.org
roles:
- paas-lxc
- paas-docker
- paas-docker-dev
- mastodon
flags:
install_docker_devel_tools: True
network:
ipv6_tunnel: True
canonical_public_ipv4: 51.255.124.11
interfaces:
public:
device: ens192
uuid: 6e05ebea-f2fd-4ca1-a21f-78a778664d8c
ipv4:
address: 51.255.124.11
netmask: *intranought_netmask
gateway: 51.210.99.254
intranought:
device: ens224
uuid: 8e8ca793-b2eb-46d8-9266-125aba6d06c4
ipv4:
address: 172.27.27.4
netmask: *intranought_netmask
gateway: 172.27.27.1
- docker-001:
- forest: nasqueron-infra
- hostname: docker-001.nasqueron.org
- roles:
- - paas-docker
- - paas-docker-prod
- network:
- ipv6_tunnel: False
-
- canonical_public_ipv4: 51.255.124.9
-
- interfaces:
- public:
- device: ens192
- uuid: ef7370c5-5060-4d89-82bb-dbeabf4a35f6
- ipv4:
- address: 51.255.124.9
- netmask: *intranought_netmask
- gateway: 51.210.99.254
-
- intranought:
- device: ens224
- uuid: 3fd0b9f8-ecc3-400d-bc61-3ba21d0b6337
- ipv4:
- address: 172.27.27.6
- netmask: *intranought_netmask
- gateway: 172.27.27.1
-
docker-002:
forest: nasqueron-infra
hostname: docker-002.nasqueron.org
roles:
- paas-docker
- paas-docker-prod
network:
ipv6_tunnel: True
canonical_public_ipv4: 51.255.124.9
interfaces:
public:
device: ens192
uuid: d55e0fec-f90b-3014-a458-9067ff8f2520
ipv4:
address: 51.255.124.10
netmask: *intranought_netmask
gateway: 51.210.99.254
intranought:
device: ens224
uuid: 57c04bcc-929b-3177-a2e3-88f84f210721
ipv4:
address: 172.27.27.5
netmask: *intranought_netmask
gateway: 172.27.27.1
router-001:
forest: nasqueron-infra
hostname: router-001.nasqueron.org
roles:
- router
network:
ipv6_tunnel: False
canonical_public_ipv4: 51.255.124.8
interfaces:
public:
device: vmx0
ipv4:
address: 51.255.124.8
netmask: *intranought_netmask
gateway: 51.210.99.254
flags:
- ipv4_ovh_failover
intranought:
device: vmx1
ipv4:
address: 172.27.27.1
netmask: *intranought_netmask
ysul:
forest: nasqueron-dev
hostname: ysul.nasqueron.org
roles:
- devserver
- dbserver-mysql
- viperserv
- webserver-legacy
zfs:
pool: arcology
network:
ipv6_tunnel: True
ipv6_gateway: 2001:470:1f12:9e1::1
canonical_public_ipv4: 212.83.187.132
interfaces:
igb0:
device: igb0
ipv4:
address: 163.172.49.16
netmask: 255.255.255.0
gateway: 163.172.49.1
aliases:
- 212.83.187.132
windriver:
forest: nasqueron-dev
hostname: windriver.nasqueron.org
roles:
- devserver
- dbserver-mysql
- webserver-legacy
zfs:
pool: arcology
network:
ipv6_native: True
ipv6_tunnel: False
canonical_public_ipv4: 51.159.18.59
interfaces:
igb0:
device: igb0
ipv4:
address: 51.159.18.59
netmask: 255.255.255.0
gateway: 51.159.18.1
ipv6:
address: 2001:0bc8:6005:0005:aa1e:84ff:fef3:5d9c
gateway: fe80::a293:51ff:feb7:5073
prefix: 128
##
## 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
canonical_public_ipv4: 51.159.150.221
interfaces:
ens2:
device: ens2
ipv4:
address: 51.159.150.221
gateway: ""
flags:
# This interface is configured by cloud-init
- skip_interface_configuration
fixes:
rsyslog_xconsole: True
diff --git a/roles/core/motd/files/docker-001 b/roles/core/motd/files/docker-001
deleted file mode 100644
index 8900675..0000000
--- a/roles/core/motd/files/docker-001
+++ /dev/null
@@ -1,14 +0,0 @@
-
- docker-001 ______
- \ \
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
- structure server. \ \_ GW: {{ ipv4_gateway }}
- _\ \
- PaaS Docker \ \
- \ \_
- The containers hosted _\ \
- here are in production. \ \
- \ \_
- /// /// /// /// /// /// _\ \
- \ \
-___________________________________\ \_________mic'03
diff --git a/roles/devserver/userland-home/files/dereckson/bin/deploy-container b/roles/devserver/userland-home/files/dereckson/bin/deploy-container
index 20a8984..8766011 100755
--- a/roles/devserver/userland-home/files/dereckson/bin/deploy-container
+++ b/roles/devserver/userland-home/files/dereckson/bin/deploy-container
@@ -1,21 +1,21 @@
#!/bin/sh
if [ $# -eq 0 ]; then
echo "Usage: deploy-container <container name>"
exit 1
fi
SALT_OPS_REPO=/opt/salt/nasqueron-operations
SALT="salt-wrapper salt"
-PAAS_DOCKER_SERVER="docker-001"
+PAAS_DOCKER_SERVER="docker-002"
CONTAINER=$1
CONTAINER_SLS="$SALT_OPS_REPO/roles/paas-docker/containers/$CONTAINER.sls"
if [ ! -f "$CONTAINER_SLS" ]; then
echo "No state found for container $CONTAINER: $CONTAINER_SLS"
exit 2
fi
cd /opt/salt/nasqueron-operations || exit 4
$SALT $PAAS_DOCKER_SERVER state.sls "roles/paas-docker/containers/$CONTAINER"

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 24, 18:03 (56 m, 51 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258606
Default Alt Text
(11 KB)

Event Timeline

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