7400 adapt:修改stage_one的配置文件名字与PORFILE名字对应
This commit is contained in:
fumingwei
@@ -32,7 +32,7 @@ kni:
|
||||
listen_eth: eth_pf.100
|
||||
|
||||
mrzcpd:
|
||||
mrglobal_conf_mcn0:
|
||||
mrglobal_conf:
|
||||
device:
|
||||
nic_raw: eth_raw
|
||||
nic_mcn1: eth_mcn1
|
||||
@@ -40,11 +40,6 @@ mrzcpd:
|
||||
nic_mcn3: eth_mcn3
|
||||
service:
|
||||
iocore: 52,53,54,55
|
||||
mrglobal_conf_mcn123:
|
||||
device:
|
||||
nic_mirr: eth_mirr_d
|
||||
service:
|
||||
iocore: 53,54
|
||||
|
||||
sapp:
|
||||
gdev_conf:
|
||||
@@ -63,27 +58,6 @@ sapp:
|
||||
overlay_tunnel_definition:
|
||||
overlay_mode: '{% raw %}{{ sapp_overlay_mode }}{% endraw %}'
|
||||
|
||||
tfe:
|
||||
tfe_env_config:
|
||||
TFE_DEVICE_DATA_INCOMING: eth_pxy
|
||||
TFE_PEER_MAC_DATA_INCOMING: aa:bb:cc:dd:ee:ff
|
||||
tfe_conf:
|
||||
system:
|
||||
nr_worker_threads: 32
|
||||
enable_cpu_affinity: 0
|
||||
kni:
|
||||
ip: 192.168.100.1
|
||||
ssl:
|
||||
mc_cache_eth: eth_ctl
|
||||
key_keeper:
|
||||
cert_store_host: 192.168.100.1
|
||||
kafka:
|
||||
NIC_NAME: eth_ctl
|
||||
traffic_mirror:
|
||||
enable: 1
|
||||
device: eth_mirr_d
|
||||
type: 1
|
||||
|
||||
tsg_diagnose:
|
||||
docker_compose_yml:
|
||||
virtual_server_nic: eth_dign_s
|
||||
@@ -0,0 +1,30 @@
|
||||
# TOD: TSG-6386 调整 TSG-OS 中的脚本， 适配 TSG-7400 硬件平台
|
||||
# variable format {role_name}.{configname}.{section}.{var} configname 用 "_" 替代 "." 和
|
||||
|
||||
mrzcpd:
|
||||
mrglobal_conf:
|
||||
device:
|
||||
nic_mirr: eth_mirr_d
|
||||
service:
|
||||
iocore: 53,54
|
||||
|
||||
tfe:
|
||||
tfe_env_config:
|
||||
TFE_DEVICE_DATA_INCOMING: eth_pxy
|
||||
TFE_PEER_MAC_DATA_INCOMING: aa:bb:cc:dd:ee:ff
|
||||
tfe_conf:
|
||||
system:
|
||||
nr_worker_threads: 32
|
||||
enable_cpu_affinity: 0
|
||||
kni:
|
||||
ip: 192.168.100.1
|
||||
ssl:
|
||||
mc_cache_eth: eth_ctl
|
||||
key_keeper:
|
||||
cert_store_host: 192.168.100.1
|
||||
kafka:
|
||||
NIC_NAME: eth_ctl
|
||||
traffic_mirror:
|
||||
enable: 1
|
||||
device: eth_mirr_d
|
||||
type: 1
|
||||
@@ -1,9 +1,9 @@
|
||||
[device]
|
||||
device={{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},vxlan_user,vxlan_fwd
|
||||
device={{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }},vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }}]
|
||||
[device:{{ mrzcpd.mrglobal_conf.device.nic_raw }}]
|
||||
{% raw %}
|
||||
{% if NPB_device == 'inline_device' %}
|
||||
in_addr={{inline_device_config.keepalive_ip}}
|
||||
@@ -22,19 +22,19 @@ vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
promisc=1
|
||||
|
||||
[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }}]
|
||||
[device:{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }}]
|
||||
[device:{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }}]
|
||||
[device:{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
@@ -42,7 +42,7 @@ promisc=1
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mrzcpd.mrglobal_conf_mcn0.service.iocore }}
|
||||
iocore={{ mrzcpd.mrglobal_conf.service.iocore }}
|
||||
distmode=2
|
||||
hashmode=0
|
||||
|
||||
@@ -65,14 +65,14 @@ sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=10
|
||||
forward_rule_0=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }}
|
||||
forward_rule_1=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }}
|
||||
forward_rule_0=pv,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_raw }}
|
||||
forward_rule_1=vp,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_raw }}
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }}
|
||||
forward_rule_5=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }}
|
||||
forward_rule_6=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }}
|
||||
forward_rule_7=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }}
|
||||
forward_rule_8=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }}
|
||||
forward_rule_9=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }}
|
||||
forward_rule_4=pv,{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }}
|
||||
forward_rule_5=vp,{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn1 }}
|
||||
forward_rule_6=pv,{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }}
|
||||
forward_rule_7=vp,{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn2 }}
|
||||
forward_rule_8=pv,{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }}
|
||||
forward_rule_9=vp,{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf.device.nic_mcn3 }}
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
[device]
|
||||
device={{ mrzcpd.mrglobal_conf_mcn123.device.nic_mirr }}
|
||||
device={{ mrzcpd.mrglobal_conf.device.nic_mirr }}
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{ mrzcpd.mrglobal_conf_mcn123.device.nic_mirr }}]
|
||||
[device:{{ mrzcpd.mrglobal_conf.device.nic_mirr }}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[service]
|
||||
iocore={{ mrzcpd.mrglobal_conf_mcn123.service.iocore }}
|
||||
iocore={{ mrzcpd.mrglobal_conf.service.iocore }}
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7d0000000000
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- hosts: 7400-MCN0-P01R01
|
||||
remote_user: root
|
||||
vars_files:
|
||||
- install_config/group_vars/stage_one_tsg_7400.yml
|
||||
- install_config/group_vars/stage_one_7400MCN0P01R01.yml
|
||||
- install_config/group_vars/rpm_version.yml
|
||||
roles:
|
||||
- {role: tsg-os-provision, tags: tsg-os-provision}
|
||||
@@ -28,7 +28,7 @@
|
||||
- hosts: 7400-MCN123-P01R01
|
||||
remote_user: root
|
||||
vars_files:
|
||||
- install_config/group_vars/stage_one_tsg_7400.yml
|
||||
- install_config/group_vars/stage_one_7400MCN123P01R01.yml
|
||||
- install_config/group_vars/rpm_version.yml
|
||||
roles:
|
||||
- {role: tsg-os-provision, tags: tsg-os-provision}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- hosts: tsg_9140_chroot
|
||||
remote_user: root
|
||||
vars_files:
|
||||
- install_config/group_vars/stage_one_tsg_9140.yml
|
||||
- install_config/group_vars/stage_one_9000NPBP01R01.yml
|
||||
- install_config/group_vars/rpm_version.yml
|
||||
roles:
|
||||
#- {role: init-env, tags: init-env}
|
||||
|
||||
Reference in New Issue
Block a user