From 44ed2666a8aaddd1bbf8297e68ec660787134306 Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 23 Sep 2019 15:54:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0tsg-env-mxn=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=96=87=E4=BB=B6;=202.=E4=BF=AE=E6=94=B9=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=9D=BF=E7=9A=84=E4=BE=9D=E8=B5=96=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?,=20=E5=A2=9E=E5=8A=A0mrenv.service.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/tsg-env-mcn0/files/setup | 2 +- roles/tsg-env-mcn0/files/tsg-env.service | 2 +- roles/tsg-env-mcn1/files/setup | 5 +++-- roles/tsg-env-mcn1/files/tsg-env.service | 6 +++--- roles/tsg-env-mcn2/files/setup | 4 ++-- roles/tsg-env-mcn2/files/tsg-env.service | 6 +++--- roles/tsg-env-mcn3/files/setup | 8 +++++--- roles/tsg-env-mcn3/files/tsg-env.service | 6 +++--- roles/tsg-env-mxn/files/setup | 17 ++++++++++++++++ roles/tsg-env-mxn/files/stop | 5 +++++ roles/tsg-env-mxn/files/tsg-env.service | 13 ++++++++++++ roles/tsg-env-mxn/tasks/main.yml | 25 ++++++++++++++++++++++++ 12 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 roles/tsg-env-mxn/files/setup create mode 100644 roles/tsg-env-mxn/files/stop create mode 100644 roles/tsg-env-mxn/files/tsg-env.service create mode 100644 roles/tsg-env-mxn/tasks/main.yml diff --git a/roles/tsg-env-mcn0/files/setup b/roles/tsg-env-mcn0/files/setup index 1229381..9950961 100644 --- a/roles/tsg-env-mcn0/files/setup +++ b/roles/tsg-env-mcn0/files/setup @@ -16,8 +16,8 @@ ip link set ens1 vf 2 vlan 200 ifconfig ens1f3 192.168.200.1 netmask 255.255.255.0 -ifconfig enp7s0 up ifconfig enp8s0 up +ifconfig enp9s0 up ifconfig ens1f1 up ifconfig ens1f2 up ifconfig ens1f3 up diff --git a/roles/tsg-env-mcn0/files/tsg-env.service b/roles/tsg-env-mcn0/files/tsg-env.service index ea6e3f5..e3a917c 100644 --- a/roles/tsg-env-mcn0/files/tsg-env.service +++ b/roles/tsg-env-mcn0/files/tsg-env.service @@ -1,5 +1,5 @@ [Unit] -Description=tsg env init +Description=tsg sled-mcn0 env init Requires=network.target After=network.target Before=mrenv.service diff --git a/roles/tsg-env-mcn1/files/setup b/roles/tsg-env-mcn1/files/setup index e6e32f6..98c1f94 100644 --- a/roles/tsg-env-mcn1/files/setup +++ b/roles/tsg-env-mcn1/files/setup @@ -9,16 +9,17 @@ echo 0 > /sys/class/net/ens1/device/sriov_numvfs sleep 1 - echo 3 > /sys/class/net/ens1/device/sriov_numvfs + echo 4 > /sys/class/net/ens1/device/sriov_numvfs sleep 1 ifconfig ens1f3 up ip link set ens1 vf 2 vlan 200 ifconfig ens1f3 192.168.200.2 netmask 255.255.255.0 -ifconfig enp7s0 up ifconfig enp8s0 up +ifconfig enp9s0 up ifconfig ens1f1 up ifconfig ens1f2 up ifconfig ens1f3 up +ifconfig ens1f4 up diff --git a/roles/tsg-env-mcn1/files/tsg-env.service b/roles/tsg-env-mcn1/files/tsg-env.service index edfbe36..4854cd4 100644 --- a/roles/tsg-env-mcn1/files/tsg-env.service +++ b/roles/tsg-env-mcn1/files/tsg-env.service @@ -1,8 +1,8 @@ [Unit] -Description=tsg env init +Description=tsg sled-mcn1 env init Requires=network.target After=network.target -Before=tfe-env.service +Before=tfe-env.service mrenv.service [Service] ExecStart=/opt/tsg/env/setup @@ -12,4 +12,4 @@ RemainAfterExit=yes [Install] WantedBy=multi-user.target -RequiredBy=tfe-env.service \ No newline at end of file +RequiredBy=tfe-env.service mrenv.service \ No newline at end of file diff --git a/roles/tsg-env-mcn2/files/setup b/roles/tsg-env-mcn2/files/setup index a09b140..9b93050 100644 --- a/roles/tsg-env-mcn2/files/setup +++ b/roles/tsg-env-mcn2/files/setup @@ -8,15 +8,15 @@ echo 0 > /sys/class/net/ens8/device/sriov_numvfs sleep 1 - echo 3 > /sys/class/net/ens8/device/sriov_numvfs + echo 4 > /sys/class/net/ens8/device/sriov_numvfs sleep 1 ifconfig ens8f3 up ip link set ens8 vf 2 vlan 200 ifconfig ens8f3 192.168.200.3 netmask 255.255.255.0 -ifconfig enp7s0 up ifconfig enp8s0 up +ifconfig enp9s0 up ifconfig ens8f1 up ifconfig ens8f2 up ifconfig ens8f3 up diff --git a/roles/tsg-env-mcn2/files/tsg-env.service b/roles/tsg-env-mcn2/files/tsg-env.service index 0ad2061..c78a63b 100644 --- a/roles/tsg-env-mcn2/files/tsg-env.service +++ b/roles/tsg-env-mcn2/files/tsg-env.service @@ -1,8 +1,8 @@ [Unit] -Description=tsg env init +Description=tsg sled-mcn2 env init Requires=network.target After=network.target -Before=tfe-env.service +Before=tfe-env.service mrenv.service [Service] ExecStart=/opt/tsg/env/setup @@ -12,4 +12,4 @@ RemainAfterExit=yes [Install] WantedBy=multi-user.target -RequiredBy=tfe-env.service +RequiredBy=tfe-env.service mrenv.service diff --git a/roles/tsg-env-mcn3/files/setup b/roles/tsg-env-mcn3/files/setup index 3c46a51..ad38ce7 100644 --- a/roles/tsg-env-mcn3/files/setup +++ b/roles/tsg-env-mcn3/files/setup @@ -8,14 +8,16 @@ echo 0 > /sys/class/net/ens8/device/sriov_numvfs sleep 1 - echo 3 > /sys/class/net/ens8/device/sriov_numvfs + echo 4 > /sys/class/net/ens8/device/sriov_numvfs sleep 1 ifconfig ens8f3 up ip link set ens8 vf 2 vlan 200 ifconfig ens8f3 192.168.200.4 netmask 255.255.255.0 -ifconfig enp7s0 up + ifconfig enp8s0 up +ifconfig enp9s0 up ifconfig ens8f1 up ifconfig ens8f2 up -ifconfig ens8f3 up \ No newline at end of file +ifconfig ens8f3 up +ifconfig ens8f4 up \ No newline at end of file diff --git a/roles/tsg-env-mcn3/files/tsg-env.service b/roles/tsg-env-mcn3/files/tsg-env.service index 0ad2061..29f6319 100644 --- a/roles/tsg-env-mcn3/files/tsg-env.service +++ b/roles/tsg-env-mcn3/files/tsg-env.service @@ -1,8 +1,8 @@ [Unit] -Description=tsg env init +Description=tsg sled-mcn3 env init Requires=network.target After=network.target -Before=tfe-env.service +Before=tfe-env.service mrenv.service [Service] ExecStart=/opt/tsg/env/setup @@ -12,4 +12,4 @@ RemainAfterExit=yes [Install] WantedBy=multi-user.target -RequiredBy=tfe-env.service +RequiredBy=tfe-env.service mrenv.service diff --git a/roles/tsg-env-mxn/files/setup b/roles/tsg-env-mxn/files/setup new file mode 100644 index 0000000..12603cb --- /dev/null +++ b/roles/tsg-env-mxn/files/setup @@ -0,0 +1,17 @@ +#!/bin/bash + +/usr/local/bin/open_intf.inst +vconfig add ens1 100 +vconfig set_flag ens1.100 1 1 +ifconfig ens1.100 192.168.100.5 netmask 255.255.255.0 up + +vconfig add ens1 200 +vconfig set_flag ens1.200 1 1 +ifconfig ens1.200 192.168.200.5 netmask 255.255.255.0 up + +echo 1 > /proc/sys/net/ipv6/conf/default/disable_ipv6 + +/usr/local/testpoint/testpoint.sh start full & + +echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6 +echo 1 > /proc/sys/net/ipv6/conf/default/disable_ipv6 diff --git a/roles/tsg-env-mxn/files/stop b/roles/tsg-env-mxn/files/stop new file mode 100644 index 0000000..04ff992 --- /dev/null +++ b/roles/tsg-env-mxn/files/stop @@ -0,0 +1,5 @@ +#!/bin/sh +echo 0 > /sys/class/net/ens1/device/sriov_numvfs +ifconfig ens1.100 down +vconfig rem ens1.100 +ifconfig ens1 down \ No newline at end of file diff --git a/roles/tsg-env-mxn/files/tsg-env.service b/roles/tsg-env-mxn/files/tsg-env.service new file mode 100644 index 0000000..fc655b3 --- /dev/null +++ b/roles/tsg-env-mxn/files/tsg-env.service @@ -0,0 +1,13 @@ +[Unit] +Description=tsg sled-mxn env init +Requires=network.target +After=network.target + +[Service] +ExecStart=/opt/tsg/env/setup +ExecStop=/opt/tsg/env/stop +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/roles/tsg-env-mxn/tasks/main.yml b/roles/tsg-env-mxn/tasks/main.yml new file mode 100644 index 0000000..ccc658e --- /dev/null +++ b/roles/tsg-env-mxn/tasks/main.yml @@ -0,0 +1,25 @@ +--- +- name: "copy setup script" + copy: + src: "{{ role_path }}/files/setup" + dest: "/opt/tsg/env/" + mode: 0755 + +- name: "copy stop script" + copy: + src: "{{ role_path }}/files/stop" + dest: "/opt/tsg/env/" + mode: 0755 + +- name: "copy tsg-env.service" + copy: + src: "{{ role_path }}/files/tsg-env.service" + dest: "/usr/lib/systemd/system/" + mode: 0644 + +- name: "enable tsg-env" + systemd: + name: tsg-env + enabled: yes + daemon_reload: yes +