7400 adapt: firewall网卡相关变量从配置文件读取

ansible/install_config/group_vars/stage_one_tsg_7400.yml

@@ -0,0 +1,10 @@
+# TOD: TSG-6386 调整 TSG-OS 中的脚本， 适配 TSG-7400 硬件平台
+# variable format {role_name}.{configname}.{section}.{var}  configname 用 "_" 替代 "."
+
+firewall:
+  capture_packet_plug_conf:
+    LOG:
+      NIC_NAME: eth_ctl
+  main_conf:
+    TSG_LOG:
+      NIC_NAME: eth_ctl

ansible/install_config/group_vars/stage_one_tsg_9140.yml

@@ -0,0 +1,10 @@
+# TOD: TSG-6386 调整 TSG-OS 中的脚本， 适配 TSG-9140 硬件平台
+# variable format {role_name}.{configname}.{section}.{var}  configname 用 "_" 替代 "."
+
+firewall:
+  capture_packet_plug_conf:
+    LOG:
+      NIC_NAME: enp130s2f3
+  main_conf:
+    TSG_LOG:
+      NIC_NAME: enp130s2f3

ansible/install_config/group_vars/tsg_7400_docker.yml

@@ -1 +0,0 @@
-# TOD by mingwei: TSG-6386 调整 TSG-OS 中的脚本， 适配 TSG-7400 硬件平台

ansible/install_config/group_vars/tsg_9140_docker.yml

@@ -1,51 +0,0 @@
-TSG_9140_data_incoming:
-  x710_3300: enp1s0
-  vf0_name: enp1s2
-  x710_3200: enp130s0
-  vf1_name: enp130s2
-
-TSG_9140_VXLAN:
-  keepalive_ip: "10.254.19.1"
-  keepalive_mask: "255.255.255.252"
-
-TSG_9140_mrzcpd:
-  iocore: 52,53,54,55
-
-mrtunnat:
-  lcore_id: 38
-
-sapp:
-  worker_threads: 22
-  send_only_threads_max: 1
-  bind_mask: 15,16,17,18,19,20,21,22,23,24,25,26,27,42,43,44,45,46,47,48,49,50,51
-  inbound_route_dir: 1
-
-sapp_prometheus_enable: 1
-sapp_prometheus_port: 9273
-sapp_prometheus_url_path: "/metrics"
-breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6
-
-inline_device_config:
-  keepalive_ip: 10.254.19.1
-  keepalive_mask: 255.255.255.252
-  data_incoming: enp130s2f3
-
-nic_mgr:
-  name: enp130s2f3
-
-kni_log_level: 10
-
-#Kni Config
-kni:
-  global:
-    tfe_node_count: 1
-  watch_dog:
-    switch: 1
-  maat:
-    readconf_mode: 2
-  send_logger:
-    switch: 1
-  tfe_nodes:
-    tfe0_enabled: 1
-    tfe1_enabled: 0
-    tfe2_enabled: 0

ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2

@@ -22,12 +22,7 @@ ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
 {% endraw %}
 
 [LOG]
-{% if PROFILE_ID == '9000-NPB-P01R01' %}
-NIC_NAME=enp130s2f3
-{% endif %}
-{% if PROFILE_ID == '7400-MCN0-P01R01' %}
-NIC_NAME=eth_ctl
-{% endif %}
+NIC_NAME={{ firewall.capture_packet_plug_conf.LOG.NIC_NAME }}
 {% raw %}
 BROKER_LIST={{ log_kafkabrokers.address | join(",") }}
 {% endraw %}

ansible/roles/firewall/templates/main.conf.j2.j2

@@ -39,12 +39,7 @@ IP_ADDR_TABLE="TSG_SECURITY_ADDR"
 
 [TSG_LOG]
 MODE=1
-{% if PROFILE_ID == '9000-NPB-P01R01' %}
-NIC_NAME="enp130s2f3"
-{% endif %}
-{% if PROFILE_ID == '7400-MCN0-P01R01' %}
-NIC_NAME="eth_ctl"
-{% endif %}
+NIC_NAME="{{ firewall.main_conf.TSG_LOG.NIC_NAME }}"
 MAX_SERVICE=1
 LOG_LEVEL=30
 LOG_PATH="./tsglog/tsglog"

ansible/tsg_7400_deploy.yml

@@ -1,7 +1,7 @@
 - hosts: 7400-MCN0-P01R01
   remote_user: root
   vars_files:
-    - install_config/group_vars/tsg_7400_docker.yml
+    - install_config/group_vars/stage_one_tsg_7400.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/tsg_7400_docker.yml
+    - install_config/group_vars/stage_one_tsg_7400.yml
     - install_config/group_vars/rpm_version.yml
   roles:
     - {role: tsg-os-provision, tags: tsg-os-provision}

ansible/tsg_9140_deploy.yml

@@ -1,7 +1,7 @@
 - hosts: tsg_9140_chroot
   remote_user: root
   vars_files:
-    - install_config/group_vars/tsg_9140_docker.yml
+    - install_config/group_vars/stage_one_tsg_9140.yml
     - install_config/group_vars/rpm_version.yml
   roles:
     #- {role: init-env, tags: init-env}