Page MenuHomeDevCentral

D3974.id10363.diff
No OneTemporary

D3974.id10363.diff

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:
@@ -58,9 +58,9 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- db-A-001:
+ db-a-001:
forest: nasqueron-infra
- hostname: db-A-001.nasqueron.drake
+ hostname: db-a-001.nasqueron.drake
roles:
- dbserver-pgsql
zfs:
@@ -78,9 +78,9 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- db-B-001:
+ db-b-001:
forest: nasqueron-infra
- hostname: db-B-001.nasqueron.drake
+ hostname: db-b-001.nasqueron.drake
roles:
- dbserver-mysql
zfs:
@@ -106,6 +106,10 @@
zfs:
pool: arcology
network:
+ ipv6_tunnel: False
+
+ canonical_public_ipv4: 178.32.70.109
+
interfaces:
public:
device: vmx0
@@ -114,9 +118,10 @@
netmask: 255.255.255.255
ipv6:
address: 2001:41d0:303:d971::1057:da7a
- gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
prefix: 56
+ gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
flags:
+ - ipv4_ovh_failover
- hello_ipv6_ovh
intranought:
@@ -147,8 +152,10 @@
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
+ flags:
+ - ipv4_ovh_failover
intranought:
device: ens224
@@ -174,9 +181,11 @@
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
+ flags:
+ - ipv4_ovh_failover
intranought:
device: ens224
@@ -189,23 +198,28 @@
hervil:
forest: nasqueron-infra
hostname: hervil.nasqueron.drake
+ roles:
+ - mailserver
+ - webserver-core
+ - webserver-alkane
network:
+ ipv6_tunnel: False
+
interfaces:
- vmx0:
+ intranought:
device: vmx0
ipv4:
address: 172.27.27.3
netmask: *intranought_netmask
gateway: 172.27.27.1
- vmx1:
+
+ public:
device: vmx1
ipv4:
address: 178.32.70.108
netmask: 255.255.255.255
- roles:
- - mailserver
- - webserver-core
- - webserver-alkane
+ flags:
+ - ipv4_ovh_failover
router-001:
forest: nasqueron-infra
@@ -222,14 +236,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
+ prefix: 56
gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
- prefix: 64
flags:
- ipv4_ovh_failover
+ - hello_ipv6_ovh
intranought:
device: vmx1
@@ -239,37 +254,77 @@
router-002:
forest: nasqueron-infra
- hostname: router-002.nasqueron.drake
+ hostname: router-002.nasqueron.org
roles:
- router
zfs:
pool: zroot
+
network:
ipv6_tunnel: False
+
interfaces:
intranought:
device: vmx0
ipv4:
address: 172.27.27.11
- netmask: *intranought_netmask
+ netmask: 255.255.255.224
gateway: 172.27.27.1
+ fhrp:
+ - protocol: carp
+ id: 1
+ vip: 172.27.27.13
+ advskew: 0
+
+ public:
+ device: vmx1
+ ipv4:
+ address: 178.32.70.110
+ netmask: 255.255.255.255
+ fhrp:
+ - protocol: carp
+ id: 2
+ vip: 51.68.252.230
+ advskew: 100
+ flags:
+ - ipv4_ovh_failover
router-003:
forest: nasqueron-infra
- hostname: router-003.nasqueron.drake
+ hostname: router-003.nasqueron.org
roles:
- router
zfs:
pool: zroot
+
network:
ipv6_tunnel: False
+
interfaces:
intranought:
device: vmx0
ipv4:
address: 172.27.27.12
- netmask: *intranought_netmask
+ netmask: 255.255.255.224
gateway: 172.27.27.1
+ fhrp:
+ - protocol: carp
+ id: 1
+ vip: 172.27.27.13
+ advskew: 100
+
+ public:
+ device: vmx1
+ ipv4:
+ address: 178.32.70.111
+ netmask: 255.255.255.255
+ fhrp:
+ - protocol: carp
+ id: 2
+ vip: 51.68.252.230
+ advskew: 0
+ flags:
+ - ipv4_ovh_failover
web-001:
forest: nasqueron-infra
@@ -300,8 +355,8 @@
gateway: 51.210.99.254
ipv6:
address: 2001:41d0:303:d971::517e:c0de
- gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
prefix: 56
+ gateway: 2001:41d0:303:d9ff:ff:ff:ff:ff
flags:
- ipv4_ovh_failover
- hello_ipv6_ovh
@@ -322,14 +377,14 @@
canonical_public_ipv4: 212.83.187.132
interfaces:
- igb0:
+ public:
device: igb0
ipv4:
address: 163.172.49.16
netmask: 255.255.255.0
- gateway: 163.172.49.1
aliases:
- 212.83.187.132
+ gateway: 163.172.49.1
windriver:
forest: nasqueron-dev
@@ -358,12 +413,7 @@
canonical_public_ipv4: 195.154.30.15
interfaces:
- private_network:
- device: ix0
- ipv4:
- address: 10.91.207.15
- netmask: 255.255.255.0
- igb0:
+ public:
device: igb0
ipv4:
address: 195.154.30.15
@@ -371,13 +421,19 @@
gateway: 195.154.30.1
ipv6:
address: 2001:bc8:2e84:700::da7a:7001
- gateway: fe80::a293:51ff:feb7:55ef
prefix: 56
aliases:
- 2001:bc8:2e84:700:0:dead:c0de:b07 # ViperServ
+ gateway: fe80::a293:51ff:feb7:55ef
flags:
- ipv6_dhcp_duid
+ intranought:
+ device: ix0
+ ipv4:
+ address: 10.91.207.15
+ netmask: 255.255.255.0
+
##
## Forest: Eglide
## Semantic field: ? (P27 used for "Eglide" too)

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 6, 15:50 (12 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3502003
Default Alt Text
D3974.id10363.diff (6 KB)

Event Timeline