Page MenuHomeDevCentral
Files F24485298

D3974.diff
No OneTemporary
Actions

D3974.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
@@ -8,7 +8,7 @@
nodes_aliases:
netmasks:
- intranought: &intranought_netmask 255.255.255.240
+ intranought: &intranought_netmask 255.255.255.224
nodes:
@@ -23,7 +23,7 @@
roles:
- opensearch
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
canonical_public_ipv4: 188.165.200.229
@@ -48,7 +48,7 @@
zfs:
pool: zroot
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
interfaces:
intranought:
@@ -60,7 +60,7 @@
db-A-001:
forest: nasqueron-infra
- hostname: db-A-001.nasqueron.drake
+ hostname: db-a-001.nasqueron.drake
roles:
- dbserver-pgsql
zfs:
@@ -68,7 +68,7 @@
dbserver:
cluster: A
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
interfaces:
intranought:
@@ -80,7 +80,7 @@
db-B-001:
forest: nasqueron-infra
- hostname: db-B-001.nasqueron.drake
+ hostname: db-b-001.nasqueron.drake
roles:
- dbserver-mysql
zfs:
@@ -88,7 +88,7 @@
dbserver:
cluster: B
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
interfaces:
intranought:
@@ -106,6 +106,10 @@
zfs:
pool: arcology
network:
+ ipv6_tunnel: false
+
+ canonical_public_ipv4: 178.32.70.109
+
interfaces:
public:
device: vmx0
@@ -117,6 +121,7 @@
gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
prefix: 56
flags:
+ - ipv4_ovh_failover
- hello_ipv6_ovh
intranought:
@@ -137,7 +142,7 @@
flags:
install_docker_devel_tools: True
network:
- ipv6_tunnel: True
+ ipv6_tunnel: true
canonical_public_ipv4: 51.255.124.11
@@ -147,7 +152,7 @@
uuid: 6e05ebea-f2fd-4ca1-a21f-78a778664d8c
ipv4:
address: 51.255.124.11
- netmask: *intranought_netmask
+ netmask: 255.255.255.255
gateway: 51.210.99.254
intranought:
@@ -165,7 +170,7 @@
- paas-docker
- paas-docker-prod
network:
- ipv6_tunnel: True
+ ipv6_tunnel: true
canonical_public_ipv4: 51.255.124.9
@@ -174,8 +179,8 @@
device: ens192
uuid: d55e0fec-f90b-3014-a458-9067ff8f2520
ipv4:
- address: 51.255.124.10
- netmask: *intranought_netmask
+ address: 51.255.124.9
+ netmask: 255.255.255.255
gateway: 51.210.99.254
intranought:
@@ -190,6 +195,8 @@
forest: nasqueron-infra
hostname: hervil.nasqueron.drake
network:
+ ipv6_tunnel: false
+
interfaces:
vmx0:
device: vmx0
@@ -199,6 +206,8 @@
gateway: 172.27.27.1
vmx1:
device: vmx1
+ flags:
+ - ipv4_ovh_failover
ipv4:
address: 178.32.70.108
netmask: 255.255.255.255
@@ -213,7 +222,7 @@
roles:
- router
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
canonical_public_ipv4: 51.255.124.8
@@ -222,14 +231,15 @@
device: vmx0
ipv4:
address: 51.255.124.8
- netmask: *intranought_netmask
+ netmask: 255.255.255.255
gateway: 51.210.99.254
ipv6:
address: 2001:41d0:303:d971::6a7e
gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
- prefix: 64
+ prefix: 56
flags:
- ipv4_ovh_failover
+ - hello_ipv6_ovh
intranought:
device: vmx1
@@ -237,40 +247,84 @@
address: 172.27.27.1
netmask: *intranought_netmask
- router-002:
- forest: nasqueron-infra
- hostname: router-002.nasqueron.drake
- roles:
- - router
- zfs:
- pool: zroot
- network:
- ipv6_tunnel: False
- interfaces:
- intranought:
- device: vmx0
- ipv4:
- address: 172.27.27.11
- netmask: *intranought_netmask
- gateway: 172.27.27.1
-
- router-003:
- forest: nasqueron-infra
- hostname: router-003.nasqueron.drake
- roles:
- - router
- zfs:
- pool: zroot
- network:
- ipv6_tunnel: False
- interfaces:
- intranought:
- device: vmx0
- ipv4:
- address: 172.27.27.12
- netmask: *intranought_netmask
- gateway: 172.27.27.1
-
+router-002:
+ forest: nasqueron-infra
+ hostname: router-002.nasqueron.org
+ roles:
+ - router
+ zfs:
+ pool: zroot
+
+ network:
+ ipv6_tunnel: false
+
+ interfaces:
+ intranought:
+ device: vmx0
+ fhrp:
+ - advskew: 0
+ id: 1
+ name: carp-vhid1
+ priority: 255
+ protocol: carp
+ vip: 172.27.27.13
+ ipv4:
+ address: 172.27.27.11
+ gateway: 172.27.27.1
+ netmask: *intranought_netmask
+ public:
+ device: vmx1
+ fhrp:
+ - advskew: 100
+ id: 2
+ priority: 155
+ protocol: carp
+ vip: 51.68.252.230
+ flags:
+ - ipv4_ovh_failover
+ ipv4:
+ address: 178.32.70.110
+ netmask: 255.255.255.255
+
+router-003:
+ forest: nasqueron-infra
+ hostname: router-003.nasqueron.org
+ roles:
+ - router
+ zfs:
+ pool: zroot
+
+ network:
+ ipv6_tunnel: false
+
+ interfaces:
+ intranought:
+ device: vmx0
+ fhrp:
+ - advskew: 100
+ id: 1
+ name: carp-vhid1
+ priority: 155
+ protocol: carp
+ vip: 172.27.27.13
+ ipv4:
+ address: 172.27.27.12
+ gateway: 172.27.27.1
+ netmask: *intranought_netmask
+ public:
+ device: vmx1
+ fhrp:
+ - advskew: 0
+ id: 2
+ priority: 255
+ protocol: carp
+ vip: 51.68.252.230
+ flags:
+ - ipv4_ovh_failover
+ ipv4:
+ address: 178.32.70.111
+ netmask: 255.255.255.255
+
web-001:
forest: nasqueron-infra
hostname: web-001.nasqueron.org
@@ -280,7 +334,7 @@
- saas-mediawiki
- saas-wordpress
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
canonical_public_ipv4: 51.255.124.10
@@ -304,7 +358,6 @@
prefix: 56
flags:
- ipv4_ovh_failover
- - hello_ipv6_ovh
ysul:
forest: nasqueron-dev
@@ -316,11 +369,9 @@
zfs:
pool: arcology
network:
- ipv6_tunnel: True
+ ipv6_tunnel: true
ipv6_gateway: 2001:470:1f12:9e1::1
- canonical_public_ipv4: 212.83.187.132
-
interfaces:
igb0:
device: igb0
@@ -353,7 +404,7 @@
zfs:
pool: arcology
network:
- ipv6_tunnel: False
+ ipv6_tunnel: false
canonical_public_ipv4: 195.154.30.15
@@ -375,8 +426,7 @@
prefix: 56
aliases:
- 2001:bc8:2e84:700:0:dead:c0de:b07 # ViperServ
- flags:
- - ipv6_dhcp_duid
+
##
## Forest: Eglide

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 23, 23:46 (22 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3468622
Default Alt Text
D3974.diff (7 KB)

Event Timeline

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