diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 00b8fd06..aa8c51ab 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -65,3 +65,10 @@ tsg_diagnose_rpm_version: http_healthcheck_rpm_version: http_healthcheck: http_healthcheck-21.06.01.d0685bb + +wannat_wangw_rpm_version: + libwangw: libwangw-1.3.0.bcc9c59 + +wire_graft_rpm_version: + libwire_graft: libwire_graft-1.2.8.d123db9 + libwire_graft-devel: libwire_graft-devel-1.2.8.d123db9 diff --git a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml index 21878507..6b840e8c 100644 --- a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml +++ b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml @@ -63,4 +63,18 @@ tsg_diagnose: virtual_server_nic: eth_dign_s virtual_client_nic: eth_dign_c -cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}' \ No newline at end of file +cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}' + +wannat_wangw: + wangw_conf: + main: + NAT_GW_tunnel_recv_port: 3544 + NAT_GW_tunnel_send_port: 3544 + NAT_GW_tunnel_device: eth_ctl + +wire_graft: + wire_graft_conf: + main: + identification_by_which_device: eth_ctl + toroad: + sendto_toroad_enable: 1 \ No newline at end of file diff --git a/ansible/roles/system-init-7400-mcn0/files/setup b/ansible/roles/system-init-7400-mcn0/files/setup index 453390c6..791a1724 100644 --- a/ansible/roles/system-init-7400-mcn0/files/setup +++ b/ansible/roles/system-init-7400-mcn0/files/setup @@ -38,6 +38,7 @@ function vf_setup() sleep 5 ifconfig eth_ctl up + ifconfig eth_ctl mtu 2000 ip link set eth_pf vf 2 vlan 200 ifconfig eth_ctl 192.168.200.1 netmask 255.255.255.0 diff --git a/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01 index b5c139d3..c059bf44 100644 --- a/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01 @@ -65,4 +65,12 @@ network_setting: nic_policy_log: ipv4: 127.0.0.1/24 ipv6: 'fe80\:\:5/64' - gateway_ipv4: 191.168.1.1 \ No newline at end of file + gateway_ipv4: 191.168.1.1 + +wannat_natgw: + natgw_ip: "127.0.0.1" + +wannat_toroad: + server_ip: "127.0.0.1" + server_port: 8888 + \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 index fbfff709..311583e1 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 @@ -144,7 +144,19 @@ src: "../templates/telegraf_statistic.conf.j2" dest: /etc/telegraf/telegraf_statistic.conf tags: telegraf_statistic - + + - name: "tsg-os-provision: template wannat wangw.conf file" + template: + src: "../templates/wangw.conf.j2" + dest: /home/mesasoft/sapp_run/etc/wannat/wangw.conf + tags: wangw + + - name: "tsg-os-provision: template wire_graft.conf file" + template: + src: "../templates/wire_graft.conf.j2" + dest: /home/mesasoft/sapp_run/etc/wire_graft/wire_graft.conf + tags: wire_graft + - name: "mkdir /opt/tsg/etc/" file: path: /opt/tsg/etc diff --git a/ansible/stage_one_deploy.yml b/ansible/stage_one_deploy.yml index f021b869..a2c19bfa 100644 --- a/ansible/stage_one_deploy.yml +++ b/ansible/stage_one_deploy.yml @@ -24,6 +24,8 @@ - {role: exporter, tags: exporter} - {role: tsg-diagnose, tags: tsg-diagnose} - {role: system-init, tags: system-init} + - {role: wannat_wangw, tags: wannat_wangw} + - {role: wire_graft, tags: wire_graft} - hosts: 7400-MCN123-P01R01 remote_user: root