commit ff6f5aa357807565158f528026290e1e71726a75
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Aug 16 11:06:33 2017 +0000
committer Gerrit Code Review <gerrit2@7fdf03a22773> Wed Aug 16 11:06:33 2017 +0000
tree 2a8be8bc2dda0c03d8214af16e97ba9cb08d9564
parent 751c8dd53fd4a3bd244afb2bba076299460cce7b
parent 6deb6a73467e2f7a66095d1c402601b7468af83f

Merge "make interface route gw not mandatory"

linux/network/interface.sls

diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 7d99ec2..e225888 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -301,7 +301,9 @@
     - name: {{ route_name }}
       ipaddr: {{ route.address }}
       netmask: {{ route.netmask }}
+      {%- if route.gateway is defined %}
       gateway: {{ route.gateway }}
+      {%- endif %}
     {%- endfor %}
 
 {%- endif %}

tests/pillar/network_extended.sls

diff --git a/tests/pillar/network_extended.sls b/tests/pillar/network_extended.sls
new file mode 100644
index 0000000..19587c9
--- /dev/null
+++ b/tests/pillar/network_extended.sls
@@ -0,0 +1,34 @@
+linux:
+  system:
+    enabled: true
+    domain: ci.local
+    name: linux
+  network:
+    enabled: true
+    hostname: linux
+    fqdn: linux.ci.local
+    network_manager: false
+    interface:
+      eth0:
+        enabled: true
+        type: eth
+        address: 192.168.0.102
+        netmask: 255.255.255.0
+        gateway: 192.168.0.1
+        name_servers:
+        - 8.8.8.8
+        - 8.8.4.4
+        mtu: 1500
+        route:
+          kubernetes_internal:
+            address: 10.254.0.0
+            netmask: 255.255.0.0
+          some_other:
+            address: 10.111.0.0
+            netmask: 255.255.0.0
+            gateway: 1.1.1.1
+      vlan69:
+        enabled: true
+        type: vlan
+        use_interfaces:
+        - interface: ${linux:interface:eth0}