diff --git a/goss/s-mon.yaml b/goss/s-mon.yaml index d42f96a..2d6aa8a 100644 --- a/goss/s-mon.yaml +++ b/goss/s-mon.yaml @@ -49,7 +49,7 @@ interface: enp0s3: exists: true addrs: - - 192.168.99.104/24 + - 192.168.99.8/24 enp0s8: exists: true addrs: diff --git a/roles/base/templates/hosts.j2 b/roles/base/templates/hosts.j2 index 2ab74e6..f0b990d 100644 --- a/roles/base/templates/hosts.j2 +++ b/roles/base/templates/hosts.j2 @@ -10,18 +10,23 @@ 192.168.99.3 s-appli.gsb.adm 192.168.99.4 s-backup.gsb.adm 192.168.99.5 s-puppet.gsb.adm -192.168.99.6 s-win.gsb.adm +192.168.99.6 s-win.gsb.adm 192.168.99.7 s-nxc.gsb.adm 192.168.99.8 s-mon.gsb.adm 192.168.99.9 s-itil.gsb.adm -192.168.99.10 s-sspec.gsb.adm -192.168.99.11 s-web-ext.gsb.adm +192.168.99.10 s-lb.gsb.adm +192.168.99.11 s-elk.gsb.adm 192.168.99.10 s-dns.gsb.adm 192.168.99.12 r-int.gsb.adm 192.168.99.13 r-ext.gsb.adm 192.168.99.14 s-nas.gsb.adm 192.168.99.15 s-san.gsb.adm 192.168.99.16 s-fog.gsb.adm +192.168.99.50 s-lb-bd.gsb.adm +192.168.99.101 s-lb-web1.gsb.adm +192.168.99.102 s-lb-web2.gsb.adm +192.168.99.103 s-lb-web3.gsb.adm + 192.168.99.8 syslog.gsb.adm diff --git a/roles/base/templates/hosts.s-proxy.j2 b/roles/base/templates/hosts.s-proxy.j2 index e18d15e..7182c98 100644 --- a/roles/base/templates/hosts.s-proxy.j2 +++ b/roles/base/templates/hosts.s-proxy.j2 @@ -11,16 +11,20 @@ 192.168.99.3 s-appli.gsb.adm 192.168.99.4 s-backup.gsb.adm 192.168.99.5 s-puppet.gsb.adm -192.168.99.6 s-win.gsb.adm +192.168.99.6 s-win.gsb.adm 192.168.99.7 s-nxc.gsb.adm 192.168.99.8 s-mon.gsb.adm 192.168.99.9 s-itil.gsb.adm -192.168.99.10 s-sspec.gsb.adm -192.168.99.11 s-web-ext.gsb.adm +192.168.99.10 s-lb.gsb.adm +192.168.99.11 s-elk.gsb.adm 192.168.99.10 s-dns.gsb.adm 192.168.99.12 r-int.gsb.adm 192.168.99.13 r-ext.gsb.adm 192.168.99.14 s-nas.gsb.adm +192.168.99.50 s-lb-bd.gsb.adm +192.168.99.101 s-lb-web1.gsb.adm +192.168.99.102 s-lb-web2.gsb.adm +192.168.99.103 s-lb-web3.gsb.adm 192.168.99.8 syslog.gsb.adm diff --git a/roles/dns-master/files/db.gsb.lan b/roles/dns-master/files/db.gsb.lan index 93f62a5..61c93ba 100644 --- a/roles/dns-master/files/db.gsb.lan +++ b/roles/dns-master/files/db.gsb.lan @@ -5,7 +5,7 @@ ; $TTL 604800 @ IN SOA s-infra.gsb.lan. root.s-infra.gsb.lan. ( - 2022041200 ; Serial + 2023012500 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -25,7 +25,7 @@ s-nxc IN A 172.16.0.7 s-docker IN A 172.16.0.7 s-mon IN A 172.16.0.8 s-itil IN A 172.16.0.9 -s-elk IN A 172.16.0.10 +s-elk IN A 172.16.0.11 s-gestsup IN A 172.16.0.17 r-int IN A 172.16.0.254 r-int-lnk IN A 192.168.200.254 diff --git a/roles/dns-master/files/db.gsb.lan.rev b/roles/dns-master/files/db.gsb.lan.rev index 92a6bcc..e95bfa1 100644 --- a/roles/dns-master/files/db.gsb.lan.rev +++ b/roles/dns-master/files/db.gsb.lan.rev @@ -5,7 +5,7 @@ ; $TTL 604800 @ IN SOA s-infra.gsb.lan. root.s-infra.gsb.lan. ( - 2022041200 ; Serial + 2023012500 ; Serial 7200 ; Refresh 86400 ; Retry 8419200 ; Expire @@ -20,12 +20,12 @@ $TTL 604800 6.0 IN PTR s-win.gsb.lan. 7.0 IN PTR s-nxc.gsb.lan. 8.0 IN PTR s-mon.gsb.lan. -9.0 IN PTR s-itil.gsb.lan. +9.0 IN PTR s-itil.gsb.lan. 101.1 IN PTR s-web1 101.2 IN PTR s-web2 100.10 IN PTR s-lb 100.10 IN PTR s-lb.gsb.lan -10.0 IN PTR s-elk.gsb.lan. +11.0 IN PTR s-elk.gsb.lan. 17.0 IN PTR s-gestsup.lan 254.0 IN PTR r-int.gsb.lan. diff --git a/roles/lb-front/files/haproxy.cfg b/roles/lb-front/files/haproxy.cfg index 0f09078..37933e3 100644 --- a/roles/lb-front/files/haproxy.cfg +++ b/roles/lb-front/files/haproxy.cfg @@ -44,7 +44,6 @@ backend fermeweb #option httpchk HEAD / HTTP/1.0 server s-lb-web1 192.168.101.1:80 check server s-lb-web2 192.168.101.2:80 check - #server s-lb-web3 192.168.101.3:80 check listen stats diff --git a/roles/lb-front/tasks/main.yml b/roles/lb-front/tasks/main.yml index 9b29b92..a419b51 100644 --- a/roles/lb-front/tasks/main.yml +++ b/roles/lb-front/tasks/main.yml @@ -15,8 +15,8 @@ balance roundrobin option httpclose #option httpchk HEAD / HTTP/1.0 - server web1.test 192.168.56.3:80 check - #server web2.test 192.168.56.4:80 check + server s-lb-web1 192.168.101.1:80 check + server s-lb-web2 192.168.101.2:80 check - name: redemarre haproxy service: diff --git a/roles/post/files/interfaces.s-elk b/roles/post/files/interfaces.s-elk index 2dfa1cd..052de55 100644 --- a/roles/post/files/interfaces.s-elk +++ b/roles/post/files/interfaces.s-elk @@ -8,13 +8,13 @@ iface lo inet loopback # cote N-adm allow-hotplug enp0s3 iface enp0s3 inet static - address 192.168.99.10 + address 192.168.99.11 netmask 255.255.255.0 gateway 192.168.99.99 # cote N-infra allow-hotplug enp0s8 iface enp0s8 inet static - address 172.16.0.10 + address 172.16.0.11 netmask 255.255.255.0 post-up route add -net 172.16.64.0/24 gw 172.16.0.254 diff --git a/s-lb-web2.yml b/s-lb-web2.yml index 0c1dc9b..67f50d3 100644 --- a/s-lb-web2.yml +++ b/s-lb-web2.yml @@ -4,8 +4,8 @@ roles: - base - - s-lb-web-ab + - lb-web - snmp-agent - - s-nas-client + - lb-nfs-client - post diff --git a/s-lb.yml b/s-lb.yml index 7b0374f..9579662 100644 --- a/s-lb.yml +++ b/s-lb.yml @@ -5,7 +5,7 @@ roles: - base - goss - - s-lb-ab + - lb-front - snmp-agent - post