将tsg-env迁移至tsg-scripts project

15 files changed, 4 insertions, 246 deletions

diff --git a/roles/tsg-common-files/.gitignore b/roles/tsg-common-files/.gitignore
new file mode 100644
index 0000000..ed8ebf5
--- /dev/null
+++ b/roles/tsg-common-files/.gitignore
@@ -0,0 +1 @@
+__pycache__
\ No newline at end of file
diff --git a/roles/tsg-common-files/此文件夹存放rpm包_最终版再push到git.txt b/roles/tsg-common-files/此文件夹存放rpm包_最终版再push到git.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/roles/tsg-common-files/此文件夹存放rpm包_最终版再push到git.txt
diff --git a/roles/tsg-env-mcn0/files/setup b/roles/tsg-env-mcn0/files/setup
deleted file mode 100644
index 1229381..0000000
--- a/roles/tsg-env-mcn0/files/setup
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-  ifconfig ens1 up
-
-  modprobe 8021q
-  vconfig add ens1 100
-  vconfig set_flag ens1.100 1 1
-  ifconfig ens1.100 192.168.100.1 netmask 255.255.255.0 up
-
-  echo 0 > /sys/class/net/ens1/device/sriov_numvfs
-  sleep 1
-  echo 8 > /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.1 netmask 255.255.255.0
-
-ifconfig enp7s0 up
-ifconfig enp8s0 up
-ifconfig ens1f1 up
-ifconfig ens1f2 up
-ifconfig ens1f3 up
-ifconfig ens1f4 up
-ifconfig ens1f5 up
-ifconfig ens1f6 up
-ifconfig ens1f7 up
-ifconfig enp1s1 up
diff --git a/roles/tsg-env-mcn0/files/tsg-env.service b/roles/tsg-env-mcn0/files/tsg-env.service
deleted file mode 100644
index 8c49bce..0000000
--- a/roles/tsg-env-mcn0/files/tsg-env.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=tsg env init
-Requires=network.target
-After=network.target
-Before=mrenv.service
-
-[Service]
-#WorkingDirectory=/opt/tsg/env
-ExecStart=/opt/tsg/env/setup
-#ExecStop=/home/tsg/kni/kni_service_scipt stop
-#ExecStop=/bin/kill -9 $MAINPID
-Type=oneshot
-RemainAfterExit=yes
-#Restart=always
-#RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/tsg-env-mcn0/tasks/main.yml b/roles/tsg-env-mcn0/tasks/main.yml
deleted file mode 100644
index 7f54bd3..0000000
--- a/roles/tsg-env-mcn0/tasks/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "copy setup.sh"
-  copy:
-    src: "{{ role_path }}/files/setup"
-    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
-
diff --git a/roles/tsg-env-mcn1/files/setup b/roles/tsg-env-mcn1/files/setup
deleted file mode 100644
index f86bcfa..0000000
--- a/roles/tsg-env-mcn1/files/setup
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-  ifconfig ens1 up
-
-
-  modprobe 8021q
-  vconfig add ens1 100
-  vconfig set_flag ens1.100 1 1
-  ifconfig ens1.100 192.168.100.2 netmask 255.255.255.0 up
-
-  echo 0 > /sys/class/net/ens1/device/sriov_numvfs
-  sleep 1
-  echo 3 > /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 ens1f1 up
-ifconfig ens1f2 up
-ifconfig ens1f3 up
-
diff --git a/roles/tsg-env-mcn1/files/tsg-env.service b/roles/tsg-env-mcn1/files/tsg-env.service
deleted file mode 100644
index 8c49bce..0000000
--- a/roles/tsg-env-mcn1/files/tsg-env.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=tsg env init
-Requires=network.target
-After=network.target
-Before=mrenv.service
-
-[Service]
-#WorkingDirectory=/opt/tsg/env
-ExecStart=/opt/tsg/env/setup
-#ExecStop=/home/tsg/kni/kni_service_scipt stop
-#ExecStop=/bin/kill -9 $MAINPID
-Type=oneshot
-RemainAfterExit=yes
-#Restart=always
-#RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/tsg-env-mcn1/tasks/main.yml b/roles/tsg-env-mcn1/tasks/main.yml
deleted file mode 100644
index bcaf226..0000000
--- a/roles/tsg-env-mcn1/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "copy setup.sh"
-  copy:
-    src: "{{ role_path }}/files/setup"
-    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
diff --git a/roles/tsg-env-mcn2/files/setup b/roles/tsg-env-mcn2/files/setup
deleted file mode 100644
index a09b140..0000000
--- a/roles/tsg-env-mcn2/files/setup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-  ifconfig ens8 up
-
-  modprobe 8021q
-  vconfig add ens8 100
-  vconfig set_flag ens8.100 1 1
-  ifconfig ens8.100 192.168.100.3 netmask 255.255.255.0 up
-
-  echo 0 > /sys/class/net/ens8/device/sriov_numvfs
-  sleep 1
-  echo 3 > /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 ens8f1 up
-ifconfig ens8f2 up
-ifconfig ens8f3 up
-ifconfig ens8f4 up
\ No newline at end of file
diff --git a/roles/tsg-env-mcn2/files/tsg-env.service b/roles/tsg-env-mcn2/files/tsg-env.service
deleted file mode 100644
index 8c49bce..0000000
--- a/roles/tsg-env-mcn2/files/tsg-env.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=tsg env init
-Requires=network.target
-After=network.target
-Before=mrenv.service
-
-[Service]
-#WorkingDirectory=/opt/tsg/env
-ExecStart=/opt/tsg/env/setup
-#ExecStop=/home/tsg/kni/kni_service_scipt stop
-#ExecStop=/bin/kill -9 $MAINPID
-Type=oneshot
-RemainAfterExit=yes
-#Restart=always
-#RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/tsg-env-mcn2/tasks/main.yml b/roles/tsg-env-mcn2/tasks/main.yml
deleted file mode 100644
index bcaf226..0000000
--- a/roles/tsg-env-mcn2/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "copy setup.sh"
-  copy:
-    src: "{{ role_path }}/files/setup"
-    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
diff --git a/roles/tsg-env-mcn3/files/setup b/roles/tsg-env-mcn3/files/setup
deleted file mode 100644
index 3c46a51..0000000
--- a/roles/tsg-env-mcn3/files/setup
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-  ifconfig ens8 up
-
-  modprobe 8021q
-  vconfig add ens8 100
-  vconfig set_flag ens8.100 1 1
-  ifconfig ens8.100 192.168.100.4 netmask 255.255.255.0 up
-
-  echo 0 > /sys/class/net/ens8/device/sriov_numvfs
-  sleep 1
-  echo 3 > /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 ens8f1 up
-ifconfig ens8f2 up
-ifconfig ens8f3 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
deleted file mode 100644
index 8c49bce..0000000
--- a/roles/tsg-env-mcn3/files/tsg-env.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=tsg env init
-Requires=network.target
-After=network.target
-Before=mrenv.service
-
-[Service]
-#WorkingDirectory=/opt/tsg/env
-ExecStart=/opt/tsg/env/setup
-#ExecStop=/home/tsg/kni/kni_service_scipt stop
-#ExecStop=/bin/kill -9 $MAINPID
-Type=oneshot
-RemainAfterExit=yes
-#Restart=always
-#RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/tsg-env-mcn3/tasks/main.yml b/roles/tsg-env-mcn3/tasks/main.yml
deleted file mode 100644
index bcaf226..0000000
--- a/roles/tsg-env-mcn3/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "copy setup.sh"
-  copy:
-    src: "{{ role_path }}/files/setup"
-    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
diff --git a/tsg-cli-playbook.yml b/tsg-cli-playbook.yml
index d668f7e..167e9a4 100644
--- a/tsg-cli-playbook.yml
+++ b/tsg-cli-playbook.yml
@@ -6,19 +6,18 @@
 - hosts: sled-mcn0
   roles:
     - tsg-cli-mcn0
-    - tsg-env-mcn0
 
+    
 - hosts: sled-mcn1 
   roles:
     - tsg-cli-mcn1-3
-    - tsg-env-mcn1
+
 
 - hosts: sled-mcn2
   roles:
     - tsg-cli-mcn1-3
-    - tsg-env-mcn2
+
     
 - hosts: sled-mcn3  
   roles:
     - tsg-cli-mcn1-3
-    - tsg-env-mcn3
\ No newline at end of file