interfaces: introduce new common-with|without-dhcp include

Now we have one single include dealing with all the common interface
stuff which is present on every interface.

docs/_include/interface-common-with-dhcp.txt

@@ -0,0 +1,7 @@
+.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}
+
+.. cmdinclude:: ../_include/interface-common.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}

docs/_include/interface-common-without-dhcp.txt

@@ -0,0 +1,7 @@
+.. cmdinclude:: ../_include/interface-address.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}
+
+.. cmdinclude:: ../_include/interface-common.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}

docs/_include/interface-common.txt

@@ -0,0 +1,11 @@
+.. cmdinclude:: ../_include/interface-description.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}
+
+.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}
+
+.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
+   :var0: {{ var0 }}
+   :var1: {{ var1 }}

docs/interfaces/bond.rst

@@ -16,20 +16,8 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
-   :var0: bonding
+   :var0: bond
-   :var1: bond0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: bonding
-   :var1: bond0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: bonding
-   :var1: bond0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
-   :var0: bonding
    :var1: bond0
 
 Link Administration

docs/interfaces/bridge.rst

@@ -20,19 +20,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
-   :var0: bridge
-   :var1: br0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: bridge
-   :var1: br0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: bridge
-   :var1: br0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
    :var0: bridge
    :var1: br0
 
@@ -40,7 +28,6 @@ Common interface configuration
 
    MAC address aging `<time`> in seconds (default: 300).
 
-
 .. cfgcmd:: set interfaces bridge <interface> max-age <time>
 
    Bridge maximum aging `<time>` in seconds (default: 20).

docs/interfaces/ethernet.rst

@@ -10,19 +10,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
-   :var0: ethernet
-   :var1: eth0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: ethernet
-   :var1: eth0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: ethernet
-   :var1: eth0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
    :var0: ethernet
    :var1: eth0
 

docs/interfaces/geneve.rst

@@ -38,11 +38,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address.txt
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
-   :var0: geneve
-   :var1: gnv0
-
-.. cmdinclude:: ../_include/interface-description.txt
    :var0: geneve
    :var1: gnv0
 

docs/interfaces/macsec.rst

@@ -19,19 +19,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
-   :var0: macsec
-   :var1: macsec0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: macsec
-   :var1: macsec0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: macsec
-   :var1: macsec0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
    :var0: macsec
    :var1: macsec0
 

docs/interfaces/pseudo-ethernet.rst

@@ -44,19 +44,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address-with-dhcp.txt
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
-   :var0: pseudo-ethernet
-   :var1: peth0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: pseudo-ethernet
-   :var1: peth0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: pseudo-ethernet
-   :var1: peth0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
    :var0: pseudo-ethernet
    :var1: peth0
 

docs/interfaces/vxlan.rst

@@ -39,19 +39,7 @@ Configuration
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: ../_include/interface-address.txt
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
-   :var0: vxlan
-   :var1: vxlan0
-
-.. cmdinclude:: ../_include/interface-description.txt
-   :var0: vxlan
-   :var1: vxlan0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt
-   :var0: vxlan
-   :var1: vxlan0
-
-.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt
    :var0: vxlan
    :var1: vxlan0