Merge branch 'gulp' into 'newinfra'

[firewall] Deploy firewall on gulp

See merge request nounous/ansible!61

host_vars/gulp.adm.crans.org.yml

@@ -7,6 +7,9 @@ interfaces:
   wifi_new: ens1f0.22
   zayo: ens1f0.26
 
+firewall:
+  version: gulp
+
 loc_keepalived:
   instances:
     - name: router

host_vars/routeur-daniel.adm.crans.org.yml

@@ -7,6 +7,8 @@ interfaces:
   adh: ens22
   adh_nat: ens23
 
+firewall:
+  version: HEAD
 
 loc_keepalived:
   instances:

host_vars/routeur-sam.adm.crans.org.yml

@@ -8,6 +8,8 @@ interfaces:
   adh_nat: ens23
   srv_old: ens1
 
+firewall:
+  version: HEAD
 
 loc_keepalived:
   instances:

hosts

@@ -68,6 +68,7 @@ tealc.adm.crans.org
 sam.adm.crans.org
 daniel.adm.crans.org
 jack.adm.crans.org
+gulp.adm.crans.org
 
 [crans_vm]
 voyager.adm.crans.org

plays/firewall.yml

@@ -10,7 +10,7 @@
     - arp-proxy
 
 # Deploy firewall
-- hosts: crans_routeurs
+- hosts: crans_routeurs,gulp.adm.crans.org
   vars:
     re2o:
       server: re2o.adm.crans.org
@@ -20,7 +20,7 @@
     - firewall
 
 # Deploy BGP server configuration on IPv4 routers
-- hosts: crans_routeurs
+- hosts: crans_routeurs,gulp.adm.crans.org
   vars:
     zebra:
       password: "{{ vault_zebra_password }}"

roles/firewall/tasks/main.yml

@@ -31,6 +31,7 @@
 - name: Clone firewall repository
   git:
     repo: 'http://gitlab.adm.crans.org/nounous/firewall.git'
+    version: "{{ firewall.version }}"
     dest: /var/local/firewall
     umask: '002'