1、新增dump_rtp_pcap安装2、整合配置变量

roles/dump_rtp_pcap/tasks/main.yml

@@ -0,0 +1,22 @@
+- name: "dump-rtp-pcap: copy dump-rtp-pcap rpm package to destination"
+  copy:
+    src: "{{ role_path }}/files/"
+    dest: /tmp/ansible_deploy/
+
+- name: "dump-rtp-pcap: install dump-rtp-pcap rpm from localhost"
+  yum:
+    name:
+      - /tmp/ansible_deploy/dump_rtp_pcap-1.0.2.445da24-2.el7.x86_64.rpm
+    state: present
+
+- name: "dump-rtp-pcap: Template the dump_rtp_pcap.json"
+  template:
+    src: "{{ role_path }}/templates/dump_rtp_pcap.json.j2"
+    dest: /home/mesasoft/dump_rtp_pcap/dump_rtp_pcap.json
+  tags: template
+ 
+- name: "start dump_rtp_pcap"
+  systemd:
+    name: dump_rtp_pcap.service
+    enabled: yes
+    daemon_reload: yes

roles/dump_rtp_pcap/templates/dump_rtp_pcap.json.j2

@@ -0,0 +1,23 @@
+{
+    "endian":"little",
+    "aws_access_key_id": "{{ dump_rtp_pcap.aws_access_key_id }}",
+    "aws_secret_access_key": "{{ dump_rtp_pcap.aws_secret_access_key }}",
+    "aws_session_token": "{{ dump_rtp_pcap.aws_session_token }}",
+    "bucket_name": "rtp-log",
+    "consume_auto_offset_reset":"latest",
+    "consume_bootstrap_servers": ["{{ dump_rtp_pcap.consume_bootstrap_servers | join("\",\"") }}"],
+    "consume_topic": "INTERNAL-RTP-LOG",
+    "endpoint_url": "{{ dump_rtp_pcap.endpoint_url }}",
+    "file_prefix":"rtp_log",
+    "group_id": "rtp-log-1",
+    "produce_bootstrap_servers": "{{ dump_rtp_pcap.produce_bootstrap_servers }}",
+    "produce_topic": "VOIP-RECORD-LOG",
+    "region_name": "us-east-1",
+    "save_speed_emit_interval":30,
+    "upload_speed_emit_interval":30,
+    "queue_size":{{ dump_rtp_pcap.queue_size }},
+    "coroutine_max_num":{{ dump_rtp_pcap.coroutine_max_num }},
+    "coroutine_num":{{ dump_rtp_pcap.coroutine_num }},
+    "qfull_mode":{{ dump_rtp_pcap.qfull_mode }},
+    "qfull_interval":{{ dump_rtp_pcap.qfull_interval }}
+}

roles/firewall/templates/main.conf.j2

@@ -73,23 +73,23 @@ log_service=2
 
 
 [HOS_CONF]
-hos_serverip="{{ hos_serverip }}"
-hos_serverport={{ hos_serverport }}
-hos_accesskeyid="{{ hos_accesskeyid }}"
-hos_secretkey="{{ hos_secretkey }}"
-hos_poolsize={{ hos_poolsize }}
-hos_thread_sum={{ hos_thread_sum }}
-hos_cache_size={{ hos_cache_size }}
-hos_fs2_serverip="{{ hos_fs2_serverip }}"
-hos_fs2_serverport={{ hos_fs2_serverport }}
+hos_serverip="{{ firewall.hos_serverip }}"
+hos_serverport={{ firewall.hos_serverport }}
+hos_accesskeyid="{{ firewall.hos_accesskeyid }}"
+hos_secretkey="{{ firewall.hos_secretkey }}"
+hos_poolsize={{ firewall.hos_poolsize }}
+hos_thread_sum={{ firewall.hos_thread_sum }}
+hos_cache_size={{ firewall.hos_cache_size }}
+hos_fs2_serverip="{{ firewall.hos_fs2_serverip }}"
+hos_fs2_serverport={{ firewall.hos_fs2_serverport }}
 
 [APP_SKETCH_LOCAL]
-LOG_LEVEL={{ APP_SKETCH_LOG_LEVEL }}
-LOG_PATH="{{ APP_SKETCH_LOG_PATH }}"
-L7_PROTOCOL_LABEL="{{ APP_SKETCH_L7_PROTOCOL_LABEL }}"
+LOG_LEVEL={{ firewall.APP_SKETCH_LOG_LEVEL }}
+LOG_PATH="{{ firewall.APP_SKETCH_LOG_PATH }}"
+L7_PROTOCOL_LABEL="{{ firewall.APP_SKETCH_L7_PROTOCOL_LABEL }}"
 
 [APP_SKETCH_FEEDBACK]
-QOS={{ APP_SKETCH_QOS }}
-PUBLISH_TOPIC="{{ APP_SKETCH_PUBLISH_TOPIC }}"
+QOS={{ firewall.APP_SKETCH_QOS }}
+PUBLISH_TOPIC="{{ firewall.APP_SKETCH_PUBLISH_TOPIC }}"
 #CLIENT_ID=
-BROKER_LIST="{{ APP_SKETCH_BROKER_LIST }}"
+BROKER_LIST="{{ firewall.APP_SKETCH_BROKER_LIST }}"

roles/sapp/templates/conflist.inf.j2

@@ -8,7 +8,7 @@
 {% endif %}
 ./plug/platform/app_proto_identify/app_proto_identify.inf
 ./plug/platform/tsg_master/tsg_master.inf
-{% if tsg_app_enable == 1 %}
+{% if tsg_app.enable == 1 %}
 ./plug/platform/app_master/app_master.inf
 {% endif %}
 
@@ -32,7 +32,7 @@
 ./plug/business/fw_ftp_plug/fw_ftp_plug.inf
 ./plug/business/fw_quic_plug/fw_quic_plug.inf
 ./plug/business/conn_telemetry/conn_telemetry.inf
-{% if tsg_app_enable == 1 %}
+{% if tsg_app.enable == 1 %}
 ./plug/business/app_sketch_local/app_sketch_local.inf
 {% endif %}
 {% if tsg_access_type == 2 %}

roles/sapp/templates/sapp.toml.j2

@@ -189,9 +189,9 @@ dictator_enable=0
         app_name=sapp
      
         [profiling.log.prometheus]
-        prometheus_enabled={{ sapp_prometheus_enable }}
-        prometheus_port={{ sapp_prometheus_port }}
-        prometheus_url_path="{{ sapp_prometheus_url_path }}"
+        prometheus_enabled={{ sapp.prometheus_enable }}
+        prometheus_port={{ sapp.prometheus_port }}
+        prometheus_url_path="{{ sapp.prometheus_url_path }}"
 
 [TOOLS]
     [tools.pkt_dump]

roles/tsg_app/tasks/main.yml

@@ -12,5 +12,5 @@
   vars:
     app_packages:
       - /tmp/ansible_deploy/app_sketch_local-2.0.5.ff1622f-2.el7.x86_64.rpm
-  when: tsg_app_enable == 1
+  when: tsg_app.enable == 1