diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2 index bbf9c8a..82056ef 100644 --- a/roles/kni/templates/kni.conf.j2 +++ b/roles/kni/templates/kni.conf.j2 @@ -3,27 +3,35 @@ log_path = ./log/kni/kni.log log_level = {{ kni.global.log_level }} tfe_node_count = {{ kni.global.tfe_node_count }} tfe_data_recv_thread_num = {{ kni.global.tfe_data_recv_thread_num }} -manage_eth = {{ kni.global.manage_eth }} +manage_eth = {{ nic_mgr.name }} keepalive_replay_switch = {{ kni.global.keepalive_replay_switch }} +[tfe0] +enabled = 1 +mac_addr = fe:65:b7:03:50:bd +dev_eth_symbol = {{ nic_to_tfe.tfe0.name }} +ip_addr = 192.168.100.2 -{% for node in kni.tfe_nodes %} -[tfe{{ node.id }}] -enabled = {{ node.enabled }} -dev_eth_symbol = {{ node.dev_eth_symbol }} -mac_addr = {{ node.mac_addr }} -ip_addr = {{ node.ip_addr }} +[tfe1] +enabled = 1 +mac_addr = fe:65:b7:03:50:bd +dev_eth_symbol = {{ nic_to_tfe.tfe1.name }} +ip_addr = 192.168.100.3 -{% endfor %} +[tfe2] +enabled = 1 +mac_addr = fe:65:b7:03:50:bd +dev_eth_symbol = {{ nic_to_tfe.tfe2.name }} +ip_addr = 192.168.100.4 [tfe_cmsg_receiver] -listen_eth = {{ kni.tfe_cmsg_receiver.listen_eth }} -listen_port = {{ kni.tfe_cmsg_receiver.listen_port }} +listen_eth = {{ nic_inner_ctrl.name }} +listen_port = 2375 [watch_dog] switch = {{ kni.watch_dog.switch }} -listen_eth = {{ kni.watch_dog.listen_eth }} -listen_port = {{ kni.watch_dog.listen_port }} +listen_eth = {{ nic_inner_ctrl.name }} +listen_port = 2376 keepalive_idle = 2 keepalive_intvl = 1 keepalive_cnt = 3 @@ -32,9 +40,9 @@ keepalive_cnt = 3 readconf_mode = {{ kni.maat.readconf_mode }} tableinfo_path = ./conf/kni/maat_tableinfo.conf maatjson_path = ./conf/kni/maat_test.json -redis_ip = {{ kni.maat.redis_ip }} -redis_port = {{ kni.maat.redis_port }} -redis_index = {{ kni.maat.redis_index }} +redis_ip = {{ maat_redis_server.address }} +redis_port = {{ maat_redis_server.port }} +redis_index = {{ maat_redis_server.db }} tablename_intercept_ip = PXY_INTERCEPT_IP tablename_intercept_domain = PXY_INTERCEPT_DOMAIN default_action = {{ kni.maat.default_action }} @@ -42,7 +50,7 @@ default_action = {{ kni.maat.default_action }} [send_logger] switch = {{ kni.send_logger.switch }} kafka_topic = SESSION-RECORD-LOG -kafka_brokerlist = {{ kni.send_logger.kafka_brokerlist }} +kafka_brokerlist = {{ log_kafkabrokers.address }} [marsio] appsym = knifw diff --git a/site.yml b/site.yml index 9bb7303..3eb1a5c 100644 --- a/site.yml +++ b/site.yml @@ -1,3 +1,27 @@ +- hosts: blade-00 + roles: + - kni + vars_files: + - "vars/common.yml" + - "vars/kni.yml" + vars: + - nic_mgr: + name: eth0 + - nic_data_incoming: + name: eth6 + ip: 192.168.17.1 + mask: 255.255.255.0 + gw: 192.168.17.254 + - nic_inner_ctrl: + name: eth2.100 + - nic_to_tfe: + tfe0: + name: eth7 + tfe1: + name: eth8 + tfe2: + name: eth9 + - hosts: blade-03 roles: - framework @@ -15,31 +39,7 @@ - nic_traffic_mirror: name: eth4 use_mrzcpd: 1 - -- hosts: blade-00 - roles: - - kni - vars_files: - - "vars/kni.yml" - vars: - - nic_mgr: - name: eth0 - - nic_data_incoming: - name: eth6 - ip: 192.168.17.1 - mask: 255.255.255.0 - gw: 192.168.17.254 - - nic_inner_ctrl: - name: eth2.100 - - nic_to_tfe: - - id: 0 - name: eth7 - - id: 1 - name: eth8 - - id: 2 - name: eth9 - - + # - hosts: blade-00 # - roles: # - framework diff --git a/vars/kni.yml b/vars/kni.yml index b31f516..7ab7a78 100644 --- a/vars/kni.yml +++ b/vars/kni.yml @@ -3,37 +3,18 @@ log_level: 30 tfe_node_count: 3 tfe_data_recv_thread_num: 3 - manage_eth: eth0 keepalive_replay_switch: 1 - tfe_cmsg_receiver: - listen_eth: eth0 - listen_port: 2375 watch_dog: switch: 1 - listen_eth: eth0 - listen_port: 2376 maat: readconf_mode: 2 default_action: 128 - redis_ip: 192.168.10.41 - redis_port: 6379 - redis_index: 4 send_logger: switch: 1 - kafka_brokerlist: 192.168.10.119:9092,192.168.10.122:9092,192.168.10.123:9092 tfe_nodes: - - id: 0 + - tfe0: enabled: 1 - dev_eth_symbol: eth7 - mac_addr: fe:65:b7:03:50:bd - ip_addr: 192.168.10.38 - - id: 1 + - tfe1: enabled: 1 - dev_eth_symbol: eth8 - mac_addr: fe:65:b7:03:50:bd - ip_addr: 192.168.10.39 - - id: 2 - enabled: 1 - dev_eth_symbol: eth9 - mac_addr: fe:65:b7:03:50:bd - ip_addr: 192.168.10.40 \ No newline at end of file + - tfe2: + enabled: 1 \ No newline at end of file