refactor:将inline_device_config和keep_alive合并到inline_device_settings

ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml

@@ -46,7 +46,7 @@ sapp:
     Module:
       pcapdevice: eth_raw
       sendto_gdev_card: eth_raw
-      sendto_gdev_ip: '{% raw %}{{ keep_alive_ip }}{% endraw %}'
+      sendto_gdev_ip: '{% raw %}{{ gdev_conf_keep_alive_ip }}{% endraw %}'
   sapp_toml:
     CPU:
       worker_threads: 42

ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01

@@ -6,8 +6,8 @@ sz_buffer=0
 [device:{{ mrzcpd.mrglobal_conf.device.nic_raw }}]
 {% raw %}
 {% if NPB_device == 'inline_device' %}
-in_addr={{inline_device_config.keepalive_ip}}
-in_mask={{inline_device_config.keepalive_mask}}
+in_addr={{inline_device_settings.keepalive.ip}}
+in_mask={{inline_device_settings.keepalive.mask}}
 vlan-id-allow=1000,1001,4000,4001
 {% endif %}
 {% if NPB_device == 'tera' %}

ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01

@@ -6,11 +6,12 @@
     - name: "set sapp_overlay_mode var depend on NPB device"
       set_fact:
         sapp_overlay_mode: item.sapp_overlay_mode
+        gdev_conf_keep_alive_ip: item.gdev_conf_keep_alive_ip
       when: NPB_device == item.NPB_device
       with_items:
-        - { "sapp_overlay_mode": none, "NPB_device": tera }
-        - { "sapp_overlay_mode": vxlan, "NPB_device": inline_device }
-        - { "sapp_overlay_mode": none, "NPB_device": direct }
+        - { "sapp_overlay_mode": none, "NPB_device": tera, "gdev_conf_keep_alive_ip": 127.0.0.1 }
+        - { "sapp_overlay_mode": vxlan, "NPB_device": inline_device, "gdev_conf_keep_alive_ip": inline_device_settings.keepalive.ip }
+        - { "sapp_overlay_mode": none, "NPB_device": direct, "gdev_conf_keep_alive_ip": 127.0.0.1 }
 
     - name: "tsg-os-provision: Template the asymmetric_presence_layer.conf.j2"
       template:

ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample

@@ -60,12 +60,10 @@ zone_group_list:
         ipv4: 127.0.0.1
         ipv6: '\:\:1'
 
-keep_alive: 127.0.0.1
-
-
-inline_device_config:
-  keepalive_ip: 127.0.0.1
-  eepalive_mask: 255.255.255.0
+inline_device_settings:
+  keepalive:
+    ip: 127.0.0.1
+    mask: 255.255.255.0
 
 maat_redis_city_server:
   address: "10.4.62.253"