Merge pull request #5 in PAR/yap from bugfix/DEV-2259-missing-config-on-yap-vxrs to master

* commit 'a24e3a6a9d8373921765027e483b694579397a82':
  Fix firewall not restarting when a new VXR is made
  Manage sysctl ip forwarding in vxr salt state

salt/yap/vxr/init.sls

@@ -73,3 +73,15 @@ yap_firewall_service:
     - name: yap-firewall
     - enable: True
     - restart: True
+
+yap_ipv4_forward:
+  sysctl.present:
+    - name: net.ipv4.ip_forward
+    - value: 1
+    - config: /etc/sysctl.d/yap.conf
+
+yap_ipv6_forward:
+  sysctl.present:
+    - name: net.ipv6.conf.all.forwarding
+    - value: 1
+    - config: /etc/sysctl.d/yap.conf

yap

@@ -936,7 +936,7 @@ function vxr_add() {
     set_var "/vxrs/$vxr/yap_id" "$(get_next_yap_ip)"
 
     # All VXRs need the IP
-    salt_update $(get_vxr_nodelist)
+    salt_update $(get_vxr_nodelist) ||:
 
     # Additional apply for authorized keys, etc.
     salt $vxr state.apply ||: