集成张智涵的部分修改。

15 files changed, 361 insertions, 0 deletions

diff --git a/adc_inline_device_access/group_vars/all.yml b/adc_inline_device_access/group_vars/all.yml
new file mode 100644
index 0000000..7b1d2a1
--- /dev/null
+++ b/adc_inline_device_access/group_vars/all.yml
@@ -0,0 +1,62 @@
+maat_redis_server:
+    address: "192.168.41.206"
+    port: 7001
+    db: 0
+
+dynamic_maat_redis_server:
+    address: "192.168.41.206"
+    port: 7001
+    db: 1
+
+cert_store_server:
+    address: "192.168.100.1"
+    port: 9991
+
+log_kafkabrokers:
+    address: "192.168.41.204:9092"
+
+log_minio:
+    address: "192.168.41.206"
+    port: 9000
+
+fs_remote:
+    switch: 1
+    address: "192.168.100.1"
+    port: 58125
+
+nic_transparent_mode:
+    enable: 0
+
+run_as_tun_mode: 0
+package_source: "local"
+
+kni:
+    global:
+        log_level: 10
+        tfe_node_count: 3
+    watch_dog:
+        switch: 1
+    maat:
+        readconf_mode: 2
+    send_logger:
+        switch: 1
+    tfe_nodes:
+        - tfe0:
+              enabled: 1
+        - tfe1:
+              enabled: 1
+        - tfe2:
+              enabled: 1
+tfe:
+    nr_threads: 16
+    keykeeper:
+        mode: "normal"
+        no_cache: 0
+
+mrzcpd:
+    iocore: 47
+
+mrtunnat:
+    lcore_id: 46
+
+
diff --git a/adc_inline_device_access/group_vars/blade-00.yml b/adc_inline_device_access/group_vars/blade-00.yml
new file mode 100644
index 0000000..31bb245
--- /dev/null
+++ b/adc_inline_device_access/group_vars/blade-00.yml
@@ -0,0 +1,15 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens1f4
+    ip: 192.168.1.30
+    mask: 255.255.255.252
+nic_inner_ctrl:
+    name: ens1.100
+nic_to_tfe:
+    tfe0:
+        name: ens1f5
+    tfe1:
+        name: ens1f6
+    tfe2:
+        name: ens1f7
diff --git a/adc_inline_device_access/group_vars/blade-01.yml b/adc_inline_device_access/group_vars/blade-01.yml
new file mode 100644
index 0000000..baec084
--- /dev/null
+++ b/adc_inline_device_access/group_vars/blade-01.yml
@@ -0,0 +1,11 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens1f1
+    mac: AA:BB:CC:DD:EE:FF
+    address: 127.0.0.1
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens1f2
+    use_mrzcpd: 1
diff --git a/adc_inline_device_access/group_vars/blade-02.yml b/adc_inline_device_access/group_vars/blade-02.yml
new file mode 100644
index 0000000..0d98ac5
--- /dev/null
+++ b/adc_inline_device_access/group_vars/blade-02.yml
@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens8.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1
diff --git a/adc_inline_device_access/group_vars/blade-03.yml b/adc_inline_device_access/group_vars/blade-03.yml
new file mode 100644
index 0000000..0d98ac5
--- /dev/null
+++ b/adc_inline_device_access/group_vars/blade-03.yml
@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens8.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1
diff --git a/adc_inline_device_access/hosts b/adc_inline_device_access/hosts
new file mode 100644
index 0000000..716f709
--- /dev/null
+++ b/adc_inline_device_access/hosts
@@ -0,0 +1,24 @@
+[all:vars]
+ansible_user=root
+package_source=local
+
+[blade-mxn]
+192.168.40.170
+
+[blade-00]
+192.168.40.166
+
+[blade-01]
+192.168.40.167
+
+[blade-02]
+192.168.40.168
+
+[blade-03]
+192.168.40.169
+
+[Functional_Host:children]
+blade-00
+blade-01
+blade-02
+blade-03
diff --git a/adc_tera_access/group_vars/all.yml b/adc_tera_access/group_vars/all.yml
new file mode 100644
index 0000000..7b1d2a1
--- /dev/null
+++ b/adc_tera_access/group_vars/all.yml
@@ -0,0 +1,62 @@
+maat_redis_server:
+    address: "192.168.41.206"
+    port: 7001
+    db: 0
+
+dynamic_maat_redis_server:
+    address: "192.168.41.206"
+    port: 7001
+    db: 1
+
+cert_store_server:
+    address: "192.168.100.1"
+    port: 9991
+
+log_kafkabrokers:
+    address: "192.168.41.204:9092"
+
+log_minio:
+    address: "192.168.41.206"
+    port: 9000
+
+fs_remote:
+    switch: 1
+    address: "192.168.100.1"
+    port: 58125
+
+nic_transparent_mode:
+    enable: 0
+
+run_as_tun_mode: 0
+package_source: "local"
+
+kni:
+    global:
+        log_level: 10
+        tfe_node_count: 3
+    watch_dog:
+        switch: 1
+    maat:
+        readconf_mode: 2
+    send_logger:
+        switch: 1
+    tfe_nodes:
+        - tfe0:
+              enabled: 1
+        - tfe1:
+              enabled: 1
+        - tfe2:
+              enabled: 1
+tfe:
+    nr_threads: 16
+    keykeeper:
+        mode: "normal"
+        no_cache: 0
+
+mrzcpd:
+    iocore: 47
+
+mrtunnat:
+    lcore_id: 46
+
+
diff --git a/adc_tera_access/group_vars/blade-00.yml b/adc_tera_access/group_vars/blade-00.yml
new file mode 100644
index 0000000..86b28bc
--- /dev/null
+++ b/adc_tera_access/group_vars/blade-00.yml
@@ -0,0 +1,13 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens1f4
+nic_inner_ctrl:
+    name: ens1.100
+nic_to_tfe:
+    tfe0:
+        name: ens1f5
+    tfe1:
+        name: ens1f6
+    tfe2:
+        name: ens1f7
diff --git a/adc_tera_access/group_vars/blade-01.yml b/adc_tera_access/group_vars/blade-01.yml
new file mode 100644
index 0000000..baec084
--- /dev/null
+++ b/adc_tera_access/group_vars/blade-01.yml
@@ -0,0 +1,11 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens1f1
+    mac: AA:BB:CC:DD:EE:FF
+    address: 127.0.0.1
+nic_inner_ctrl:
+    name: ens1.100
+nic_traffic_mirror:
+    name: ens1f2
+    use_mrzcpd: 1
diff --git a/adc_tera_access/group_vars/blade-02.yml b/adc_tera_access/group_vars/blade-02.yml
new file mode 100644
index 0000000..0d98ac5
--- /dev/null
+++ b/adc_tera_access/group_vars/blade-02.yml
@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens8.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1
diff --git a/adc_tera_access/group_vars/blade-03.yml b/adc_tera_access/group_vars/blade-03.yml
new file mode 100644
index 0000000..0d98ac5
--- /dev/null
+++ b/adc_tera_access/group_vars/blade-03.yml
@@ -0,0 +1,10 @@
+nic_mgr:
+    name: enp6s0
+nic_data_incoming:
+    name: ens8f1
+    mac: AA:BB:CC:DD:EE:FF
+nic_inner_ctrl:
+    name: ens8.100
+nic_traffic_mirror:
+    name: ens8f2
+    use_mrzcpd: 1
diff --git a/adc_tera_access/hosts b/adc_tera_access/hosts
new file mode 100644
index 0000000..d56ee31
--- /dev/null
+++ b/adc_tera_access/hosts
@@ -0,0 +1,30 @@
+[all:vars]
+ansible_user=root
+package_source=local
+
+[blade-mxn]
+192.168.40.170
+
+[blade-00]
+192.168.40.166
+
+[blade-01]
+192.168.40.167
+
+[blade-02]
+192.168.40.168
+
+[blade-03]
+192.168.40.169
+
+
+[Functional_Host:children]
+blade-00
+blade-01
+blade-02
+blade-03
+
+[Slave_Host:children]
+blade-01
+blade-02
+blade-03
diff --git a/pc_double_arm_access/group_vars/all.yml b/pc_double_arm_access/group_vars/all.yml
new file mode 100644
index 0000000..c66478f
--- /dev/null
+++ b/pc_double_arm_access/group_vars/all.yml
@@ -0,0 +1,80 @@
+maat_redis_server:
+  address: "192.168.40.83"
+  port: 7001
+  db: 0
+
+dynamic_maat_redis_server:
+  address: "192.168.40.83"
+  port: 7001
+  db: 0
+
+cert_store_server:
+  address: "127.0.0.1"
+  port: 9991
+
+log_kafkabrokers:
+  address: "192.168.40.85:9092"
+
+log_minio:
+  address: "192.168.40.85;"
+  port: 9000
+
+fs_remote:
+  switch: 1
+  address: "127.0.0.1"
+  port: 8125
+
+kni:
+  global:
+    log_level: 30
+    tfe_node_count: 3
+  watch_dog:
+    switch: 1
+  maat:
+    readconf_mode: 2
+  send_logger:
+    switch: 1
+  tfe_nodes:
+    - tfe0:
+        enabled: 1
+    - tfe1:
+        enabled: 1
+    - tfe2:
+        enabled: 1
+tfe:
+  nr_threads: 32
+  keykeeper:
+    mode: "normal"
+    no_cache: 0
+
+mrzcpd:
+  iocore: 39
+
+mrtunnat:
+  lcore_id: 38
+
+nic_mgr:
+  name: eth0
+nic_data_incoming:
+  name: tun_kni
+  address: 127.0.0.1
+nic_inner_ctrl:
+  name: lo
+nic_to_tfe:
+  tfe0:
+    name: lo
+  tfe1:
+    name: lo
+  tfe2:
+    name: lo
+nic_traffic_mirror:
+  name: lo
+  use_mrzcpd: 0
+
+nic_transparent_mode:
+  enable: 1
+  mode: pcap
+  internel_interface: "eth2"
+  external_interface: "eth3"
+
+run_as_tun_mode: 1
diff --git a/pc_double_arm_access/hosts b/pc_double_arm_access/hosts
new file mode 100644
index 0000000..9b78356
--- /dev/null
+++ b/pc_double_arm_access/hosts
@@ -0,0 +1,6 @@
+[all:vars]
+ansible_user=root
+package_source=local
+
+[pc-as-tun-mode]
+192.168.40.139
diff --git a/roles/mrzcpd/templates/mrglobal.conf.inline.j2 b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
index 10b534d..10bbd5f 100644
--- a/roles/mrzcpd/templates/mrglobal.conf.inline.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
@@ -16,10 +16,17 @@ gateway={{nic_data_incoming.gw}}
 jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
+{% if nic_data_incoming.ip is defined %}
+#vlan-filter=1
+#vlan-id-allow=3811,3812,3813,3814,3821,3822,3823,3824,3831,3832,3833,3834,3841,3842,3843,3844
+#vlan-pvid=0
+#vlan-pvid-mode=0
+{% else %}
 vlan-filter=1
 vlan-id-allow=3811,3812,3813,3814,3821,3822,3823,3824,3831,3832,3833,3834,3841,3842,3843,3844
 vlan-pvid=0
 vlan-pvid-mode=0
+{% endif %}
 
 [device:{{nic_to_tfe.tfe0.name}}]
 jumbo_frame=1