summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzhihan <[email protected]>2020-03-28 14:37:28 +0800
committerzhangzhihan <[email protected]>2020-03-28 14:37:28 +0800
commitf498412f6676e50b606486a7d7eac628ec183fed (patch)
tree9592e6153e3a7112557047987b4f9e3a998965ab
parentdbb89f7b7e14af4e669be5ec72dbe37a5089e1c1 (diff)
修改双臂模式部署部分内容
-rw-r--r--deploy.yml2
-rw-r--r--roles/tsg-env-tun-mode/files/tsg-env-tun-mode.service15
-rwxr-xr-xroles/tsg-env-tun-mode/files/vconfig-1.9-16.el7.x86_64.rpmbin0 -> 26300 bytes
-rw-r--r--roles/tsg-env-tun-mode/tasks/main.yml36
-rw-r--r--roles/tsg-env-tun-mode/templates/setup.j25
-rw-r--r--roles/tsg-env-tun-mode/templates/tsg-env_stop.j25
6 files changed, 63 insertions, 0 deletions
diff --git a/deploy.yml b/deploy.yml
index 9e77ef2..2f4312d 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -40,8 +40,10 @@
- kernel-ml
- framework
- mrzcpd
+ - tsg-env-tun-mode
- sapp
- kni
- firewall
- certstore
+ - cert-redis
- tfe
diff --git a/roles/tsg-env-tun-mode/files/tsg-env-tun-mode.service b/roles/tsg-env-tun-mode/files/tsg-env-tun-mode.service
new file mode 100644
index 0000000..d5faeb2
--- /dev/null
+++ b/roles/tsg-env-tun-mode/files/tsg-env-tun-mode.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=tsg tun mode env init
+Requires=network.target
+After=network.target
+Before=mrenv.service
+
+[Service]
+ExecStart=/opt/tsg/env/setup
+ExecStop=/opt/tsg/env/tsg-env_stop
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+RequiredBy=mrenv.service
diff --git a/roles/tsg-env-tun-mode/files/vconfig-1.9-16.el7.x86_64.rpm b/roles/tsg-env-tun-mode/files/vconfig-1.9-16.el7.x86_64.rpm
new file mode 100755
index 0000000..19310d6
--- /dev/null
+++ b/roles/tsg-env-tun-mode/files/vconfig-1.9-16.el7.x86_64.rpm
Binary files differ
diff --git a/roles/tsg-env-tun-mode/tasks/main.yml b/roles/tsg-env-tun-mode/tasks/main.yml
new file mode 100644
index 0000000..603e94c
--- /dev/null
+++ b/roles/tsg-env-tun-mode/tasks/main.yml
@@ -0,0 +1,36 @@
+---
+- name: "copy vconfig-1.9-16.el7.x86_64.rpm"
+ copy:
+ src: "{{ role_path }}/files/vconfig-1.9-16.el7.x86_64.rpm"
+ dest: /tmp
+
+- name: "template setup script"
+ template:
+ src: "{{ role_path }}/files/setup.j2"
+ dest: "/opt/tsg/env/setup"
+ mode: 0755
+
+- name: "copy tsg-env-tun-mode.service"
+ copy:
+ src: "{{ role_path }}/files/tsg-env-tun-mode.service"
+ dest: "/usr/lib/systemd/system/"
+ mode: 0644
+
+- name: "template tsg-env_stop"
+ template:
+ src: "{{ role_path }}/files/tsg-env_stop.j2"
+ dest: "/opt/tsg/env/tsg-env_stop"
+ mode: 0755
+
+- name: "install vconfig rpms from localhost"
+ yum:
+ name:
+ - /tmp/vconfig-1.9-16.el7.x86_64.rpm
+ state: present
+
+- name: "enable tsg-env-tun-mode"
+ systemd:
+ name: tsg-env-tun-mode
+ enabled: yes
+ daemon_reload: yes
+
diff --git a/roles/tsg-env-tun-mode/templates/setup.j2 b/roles/tsg-env-tun-mode/templates/setup.j2
new file mode 100644
index 0000000..d9ac77a
--- /dev/null
+++ b/roles/tsg-env-tun-mode/templates/setup.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+modprobe 8021q
+vconfig add {{ nic_mgr.name }} 100
+vconfig set_flag {{ nic_mgr.name }}.100 1 1
+ifconfig {{ nic_mgr.name }}.100 192.168.100.1 netmask 255.255.255.0 up
diff --git a/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2 b/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2
new file mode 100644
index 0000000..1ab740b
--- /dev/null
+++ b/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+#
+echo 0 >/sys/class/net/ens1/device/sriov_numvfs
+ifconfig {{ nic_mgr.name }}.100 down
+vconfig rem {{ nic_mgr.name }}.100