diff options
| author | 崔一鸣 <[email protected]> | 2019-09-24 18:34:21 +0800 |
|---|---|---|
| committer | 崔一鸣 <[email protected]> | 2019-09-24 18:34:21 +0800 |
| commit | dc18f8a1568b1d9f306adccca79892615db45738 (patch) | |
| tree | f8368d66fcc4857a72157e1c0604944e542befb1 /roles/kni | |
| parent | 6b6320ec7dbace8b2549d4c253acf40a48559101 (diff) | |
| parent | 58004fe3153e15435552a47a28c7944d10b363f0 (diff) | |
Merge branch 'astana-deploy-201909' of git.mesalab.cn:tango/tsg-scripts into astana-deploy-201909
Diffstat (limited to 'roles/kni')
| -rw-r--r-- | roles/kni/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/kni/templates/gdev.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/kni/templates/kni.conf.j2 | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/kni/tasks/main.yml b/roles/kni/tasks/main.yml index 2df9ce1..92c2ed8 100644 --- a/roles/kni/tasks/main.yml +++ b/roles/kni/tasks/main.yml @@ -1,7 +1,8 @@ --- -- name: Ensures /home/tsg exists - file: path=/home/tsg state=directory - tags: mkdir +- name: "copy sapp and kni to destination server" + copy: + src: "{{ role_path }}/files/" + dest: /tmp/ansible_deploy/ - name: "install sapp rpms from localhost" yum: diff --git a/roles/kni/templates/gdev.conf.j2 b/roles/kni/templates/gdev.conf.j2 index c262fe6..bb1bd30 100644 --- a/roles/kni/templates/gdev.conf.j2 +++ b/roles/kni/templates/gdev.conf.j2 @@ -1,5 +1,5 @@ [Module] pcapdevice={{ nic_data_incoming.name }} sendto_gdev_card={{ nic_data_incoming.name }} -sendto_gdev_ip={{ nic_data_incoming.ip }} +sendto_gdev_ip={{ nic_data_incoming.address }} gdev_status_switch=1
\ No newline at end of file diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2 index e128e61..4b7ef20 100644 --- a/roles/kni/templates/kni.conf.j2 +++ b/roles/kni/templates/kni.conf.j2 @@ -37,8 +37,13 @@ keepalive_cnt = 3 [static_maat] readconf_mode = {{ kni.maat.readconf_mode }} +<<<<<<< HEAD tableinfo_path = ./conf/kni/static_maat_tableinfo.conf maatjson_path = ./conf/kni/maat_test.json +======= +tableinfo_path = ./etc/kni/maat_tableinfo.conf +maatjson_path = ./etc/kni/maat_test.json +>>>>>>> 58004fe3153e15435552a47a28c7944d10b363f0 redis_ip = {{ maat_redis_server.address }} redis_port = {{ maat_redis_server.port }} redis_index = {{ maat_redis_server.db }} |