correc2

goss/r-vp1.yaml

@@ -1,7 +1,9 @@
 package:
 #  ferm:
 #    installed: true
-  strongswan:
+   wireguard:
+    installed: true
+   wireguard-tools:
     installed: true
 port:
   udp:68:
@@ -10,7 +12,7 @@ service:
 #  dnsmasq:
 #    enabled: true
 #    running: true
-  strongswan:
+   wireguard:
     enabled: true
     running: true
   ssh:
@@ -51,6 +53,13 @@ command:
     - 4 received = 1
     stderr: []
     timeout: 10000
+command:
+  ping -c 4 10.0.0.2:
+    exit-status: 0
+    stdout:
+    - 4 received = 1
+    stderr: []
+    timeout: 10000
 #process:
 #  dnsmasq:
 #    running: true
@@ -64,4 +73,4 @@ interface:
   enp0s9:
     exists: true
     addrs:
-    - 192.168.1.2/24
+    - 192.168.1.2/24

roles/wireguard-l/README.md

@@ -0,0 +1,5 @@
+#ajout du sleep 5
+
+éditer "/etc/init.d/isc-dhcp-server"
+aller au "case \"$1\" in" et rajouter "sleep 5" avant le "if"
+

s-lb-web1.yml

@@ -4,8 +4,8 @@
 
   roles:
     - base
-    - s-lb-web-ab
+    - lb-web
     - snmp-agent
-    - s-nas-client
+    - lb-nfs-client
     - post
 

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
 

s-nas.yml

@@ -10,8 +10,8 @@
   roles:
     - base
     - snmp-agent
-    - s-lb-wordpress
+    - lb-web
-    - s-nas-server
+    - lb-nfs-server
     - ssh-cli
     - syslog-cli
     - post

scripts/mkvm

@@ -97,11 +97,11 @@ elif [[ "${vm}" == "s-nxc" ]] ; then
         create_if "${vm}" "n-adm" "n-infra"
 elif [[ "${vm}" == "s-lb" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz" "n-dmz-lb"
-elif [[ "${vm}" == "s-web1" ]] ; then
+elif [[ "${vm}" == "s-lb-web1" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
-elif [[ "${vm}" == "s-web2" ]] ; then
+elif [[ "${vm}" == "s-lb-web2" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
-elif [[ "${vm}" == "s-web3" ]] ; then
+elif [[ "${vm}" == "s-lb-web3" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-lb" "n-dmz-db"
 elif [[ "${vm}" == "s-lb-bd" ]] ; then
         create_if "${vm}" "n-adm" "n-dmz-db"