Updated chost{a,b}.in (added linuxone interface).

diff --git a/sources/chosta.in/01_setupnetworking.sh b/sources/chosta.in/01_setupnetworking.sh
index 40fa876fbf2552aedea10b04160061e28b170f20..ede028fe56ffe306606baaaaf40215268c30b5dc 100755 (executable)
--- a/sources/chosta.in/01_setupnetworking.sh
+++ b/sources/chosta.in/01_setupnetworking.sh
@@ -8,6 +8,8 @@ set -x
 #   ens64f1: port 1 of Intel Corporation 82580, used for internal container bond
 #   ens64f2: port 2 of Intel Corporation 82580, used for external container bond
 #   ens64f3: port 3 of Intel Corporation 82580, used for external container bond
+#   ens68np2: port 2 of Intel Corporation X722, used for LinuxONE bond
+#   ens69np3: port 3 of Intel Corporation X722, used for LinuxONE bond
 #
 # if the names are incorrect: VM -> Edit Settings... -> Advanced Parameters
 #   set *.pciSlotNumber values (the two scsi adapters should be numbered
@@ -40,6 +42,16 @@ EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens64f3
 EXTERNAL_CONTAINER_BRIDGE_NAME=brce
 EXTERNAL_CONTAINER_BRIDGE_DEVICE=${EXTERNAL_CONTAINER_BRIDGE_NAME}-dev
 
+LINUXONE_BOND_NAME=bondl1
+LINUXONE_BOND_DEVICE=${LINUXONE_BOND_NAME}-dev
+LINUXONE_BOND_SLAVE_1_NAME=${LINUXONE_BOND_NAME}-slave-1
+LINUXONE_BOND_SLAVE_1_DEVICE=ens68np2
+LINUXONE_BOND_SLAVE_2_NAME=${LINUXONE_BOND_NAME}-slave-2
+LINUXONE_BOND_SLAVE_2_DEVICE=ens69np3
+
+LINUXONE_BRIDGE_NAME=brl1
+LINUXONE_BRIDGE_DEVICE=${LINUXONE_BRIDGE_NAME}-dev
+
 TENG_CONNECTION_NAME=10g
 TENG_CONNECTION_DEVICE=ens35
 
@@ -48,6 +60,8 @@ ip link set $INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE mtu 1500
 ip link set $INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE mtu 1500
 ip link set $EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE mtu 1500
 ip link set $EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE mtu 1500
+ip link set $LINUXONE_BOND_SLAVE_1_DEVICE mtu 9000
+ip link set $LINUXONE_BOND_SLAVE_2_DEVICE mtu 9000
 
 CONNECTIONS=$(nmcli --terse connection show | wc -l)
 while [ $CONNECTIONS -gt 1 ]
@@ -175,6 +189,48 @@ nmcli connection add \
     802-3-ethernet.mtu 1500 \
     save yes
 
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BRIDGE_NAME \
+    connection.interface-name $LINUXONE_BRIDGE_DEVICE \
+    connection.type bridge \
+    802-3-ethernet.mtu 9000 \
+    ipv4.method "disabled" \
+    ipv6.method "disabled" \
+    bridge.stp no \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_NAME \
+    connection.interface-name $LINUXONE_BOND_DEVICE \
+    connection.type bond \
+    connection.master $LINUXONE_BRIDGE_DEVICE \
+    connection.slave-type bridge \
+    802-3-ethernet.mtu 9000 \
+    bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_SLAVE_1_NAME \
+    connection.interface-name $LINUXONE_BOND_SLAVE_1_DEVICE \
+    connection.master $LINUXONE_BOND_DEVICE \
+    connection.slave-type bond \
+    connection.type 802-3-ethernet \
+    802-3-ethernet.mtu 9000 \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_SLAVE_2_NAME \
+    connection.interface-name $LINUXONE_BOND_SLAVE_2_DEVICE \
+    connection.master $LINUXONE_BOND_DEVICE \
+    connection.slave-type bond \
+    connection.type 802-3-ethernet \
+    802-3-ethernet.mtu 9000 \
+    save yes
+
 nmcli connection add \
     connection.autoconnect yes \
     connection.id $TENG_CONNECTION_NAME \

diff --git a/sources/chosta.in/etc/logrotate.d/rsyslog b/sources/chosta.in/etc/logrotate.d/rsyslog
new file mode 100644 (file)
index 0000000..599688d
--- /dev/null
+++ b/sources/chosta.in/etc/logrotate.d/rsyslog
@@ -0,0 +1,13 @@
+/var/log/cron
+/var/log/maillog
+/var/log/messages
+/var/log/secure
+/var/log/spooler
+{
+    missingok
+    compress
+    sharedscripts
+    postrotate
+        /usr/bin/systemctl reload rsyslog.service >/dev/null 2>&1 || true
+    endscript
+}

diff --git a/sources/chostb.in/01_setupnetworking.sh b/sources/chostb.in/01_setupnetworking.sh
index 467c9b3d71b326a17b7ddf1686dae47fb6a5ab40..4a21b0999bf57d55814f841d62e06b3037664586 100755 (executable)
--- a/sources/chostb.in/01_setupnetworking.sh
+++ b/sources/chostb.in/01_setupnetworking.sh
@@ -8,6 +8,8 @@ set -x
 #   ens64f1: port 1 of Intel Corporation 82580, used for internal container bond
 #   ens64f2: port 2 of Intel Corporation 82580, used for external container bond
 #   ens64f3: port 3 of Intel Corporation 82580, used for external container bond
+#   ens68np2: port 2 of Intel Corporation X722, used for LinuxONE bond
+#   ens69np3: port 3 of Intel Corporation X722, used for LinuxONE bond
 #
 # if the names are incorrect: VM -> Edit Settings... -> Advanced Parameters
 #   set *.pciSlotNumber values (the two scsi adapters should be numbered
@@ -40,6 +42,16 @@ EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE=ens64f3
 EXTERNAL_CONTAINER_BRIDGE_NAME=brce
 EXTERNAL_CONTAINER_BRIDGE_DEVICE=${EXTERNAL_CONTAINER_BRIDGE_NAME}-dev
 
+LINUXONE_BOND_NAME=bondl1
+LINUXONE_BOND_DEVICE=${LINUXONE_BOND_NAME}-dev
+LINUXONE_BOND_SLAVE_1_NAME=${LINUXONE_BOND_NAME}-slave-1
+LINUXONE_BOND_SLAVE_1_DEVICE=ens68np2
+LINUXONE_BOND_SLAVE_2_NAME=${LINUXONE_BOND_NAME}-slave-2
+LINUXONE_BOND_SLAVE_2_DEVICE=ens69np3
+
+LINUXONE_BRIDGE_NAME=brl1
+LINUXONE_BRIDGE_DEVICE=${LINUXONE_BRIDGE_NAME}-dev
+
 TENG_CONNECTION_NAME=10g
 TENG_CONNECTION_DEVICE=ens35
 
@@ -48,6 +60,8 @@ ip link set $INTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE mtu 1500
 ip link set $INTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE mtu 1500
 ip link set $EXTERNAL_CONTAINER_BOND_SLAVE_1_DEVICE mtu 1500
 ip link set $EXTERNAL_CONTAINER_BOND_SLAVE_2_DEVICE mtu 1500
+ip link set $LINUXONE_BOND_SLAVE_1_DEVICE mtu 9000
+ip link set $LINUXONE_BOND_SLAVE_2_DEVICE mtu 9000
 
 CONNECTIONS=$(nmcli --terse connection show | wc -l)
 while [ $CONNECTIONS -gt 1 ]
@@ -175,6 +189,48 @@ nmcli connection add \
     802-3-ethernet.mtu 1500 \
     save yes
 
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BRIDGE_NAME \
+    connection.interface-name $LINUXONE_BRIDGE_DEVICE \
+    connection.type bridge \
+    802-3-ethernet.mtu 9000 \
+    ipv4.method "disabled" \
+    ipv6.method "disabled" \
+    bridge.stp no \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_NAME \
+    connection.interface-name $LINUXONE_BOND_DEVICE \
+    connection.type bond \
+    connection.master $LINUXONE_BRIDGE_DEVICE \
+    connection.slave-type bridge \
+    802-3-ethernet.mtu 9000 \
+    bond.options "mode=802.3ad,lacp_rate=fast,miimon=100,xmit_hash_policy=layer2+3" \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_SLAVE_1_NAME \
+    connection.interface-name $LINUXONE_BOND_SLAVE_1_DEVICE \
+    connection.master $LINUXONE_BOND_DEVICE \
+    connection.slave-type bond \
+    connection.type 802-3-ethernet \
+    802-3-ethernet.mtu 9000 \
+    save yes
+
+nmcli connection add \
+    connection.autoconnect yes \
+    connection.id $LINUXONE_BOND_SLAVE_2_NAME \
+    connection.interface-name $LINUXONE_BOND_SLAVE_2_DEVICE \
+    connection.master $LINUXONE_BOND_DEVICE \
+    connection.slave-type bond \
+    connection.type 802-3-ethernet \
+    802-3-ethernet.mtu 9000 \
+    save yes
+
 nmcli connection add \
     connection.autoconnect yes \
     connection.id $TENG_CONNECTION_NAME \

diff --git a/sources/chostb.in/etc/logrotate.d/rsyslog b/sources/chostb.in/etc/logrotate.d/rsyslog
new file mode 100644 (file)
index 0000000..599688d
--- /dev/null
+++ b/sources/chostb.in/etc/logrotate.d/rsyslog
@@ -0,0 +1,13 @@
+/var/log/cron
+/var/log/maillog
+/var/log/messages
+/var/log/secure
+/var/log/spooler
+{
+    missingok
+    compress
+    sharedscripts
+    postrotate
+        /usr/bin/systemctl reload rsyslog.service >/dev/null 2>&1 || true
+    endscript
+}