diff --git a/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm deleted file mode 100644 index fa82283..0000000 Binary files a/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/wangw/files/rpm/libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm new file mode 100644 index 0000000..f2d8813 Binary files /dev/null and b/roles/wangw/files/rpm/libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm differ diff --git a/roles/wire_graft/tasks/main.yml b/roles/wire_graft/tasks/main.yml index 9d61512..6e5f29d 100644 --- a/roles/wire_graft/tasks/main.yml +++ b/roles/wire_graft/tasks/main.yml @@ -20,7 +20,7 @@ - name: "Template the wire_graft.inf" template: src: "{{ role_path }}/templates/wire_graft.inf.j2" - dest: /home/mesasoft/sapp_wannat/plug/platform/wire_graft/wire_graft.inf + dest: /home/mesasoft/sapp_run/plug/platform/wire_graft/wire_graft.inf tags: template - name: "Template the wire_graft.conf" diff --git a/xxg_integration_env/group_vars/all.yml b/xxg_integration_env/group_vars/all.yml index 0f429c6..43f7978 100644 --- a/xxg_integration_env/group_vars/all.yml +++ b/xxg_integration_env/group_vars/all.yml @@ -16,7 +16,7 @@ wangw_global: toroad_server_ip: "192.168.40.134" rpm_files: - wangw_rpm_file: "libwangw-1.2.0.7322d17-2.el7.x86_64.rpm" + wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm" diff --git a/xxg_module_test_env/group_vars/all.yml b/xxg_module_test_env/group_vars/all.yml new file mode 100644 index 0000000..b00bdc6 --- /dev/null +++ b/xxg_module_test_env/group_vars/all.yml @@ -0,0 +1,26 @@ +wangw_global: + wangw: + NAT_GW_tunnel_device: "enp8s0" + NAT_GW_tunnel_ip: "192.168.40.133" + NAT_GW_tunnel_listen_port: 3544 + NAT_GW_tunnel_remote_port: 3544 + redis_server_ip: "192.168.44.3" + redis_server_port: 7002 + redis_index: 0 + + toroad: + redis_server_ip: "192.168.44.3" + redis_server_port: 7002 + redis_index: 0 + + wiregraft: + identification_by_which_device: "enp8s0" + toroad_server_ip: "192.168.40.133" + toroad_server_port: "8888" + + rpm_files: + wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" + wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" + wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" + toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm" + diff --git a/xxg_module_test_env/hosts.xxg b/xxg_module_test_env/hosts.xxg new file mode 100644 index 0000000..6c224bf --- /dev/null +++ b/xxg_module_test_env/hosts.xxg @@ -0,0 +1,12 @@ +[all:vars] +ansible_user=root +install_sapp=false +install_device_sn=false +install_device_tag=false + +[wangw] +192.168.40.21 + +[toroad] +192.168.40.133 + diff --git a/xxg_test_env/group_vars/all.yml b/xxg_test_env/group_vars/all.yml index c435c1f..b00bdc6 100644 --- a/xxg_test_env/group_vars/all.yml +++ b/xxg_test_env/group_vars/all.yml @@ -19,7 +19,7 @@ wangw_global: toroad_server_port: "8888" rpm_files: - wangw_rpm_file: "libwangw-1.2.0.7322d17-2.el7.x86_64.rpm" + wangw_rpm_file: "libwangw-1.2.1.cb66dda-2.el7.x86_64.rpm" wire_graft_rpm_file: "libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm" wire_graft_devel_rpm_file: "libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm" toroad_rpm_file: "toroad-1.1.11.b0562a5-2.el7.x86_64.rpm"