修改部分部署bug，调整双臂模式部署

6 files changed, 19 insertions, 13 deletions

diff --git a/pc_double_arm_access/group_vars/all.yml b/pc_double_arm_access/group_vars/all.yml
index 3871e79..ed4df19 100644
--- a/pc_double_arm_access/group_vars/all.yml
+++ b/pc_double_arm_access/group_vars/all.yml
@@ -1,10 +1,10 @@
 maat_redis_server:
-  address: "192.168.40.83"
+  address: "192.168.40.168"
   port: 7002
   db: 0
 
 dynamic_maat_redis_server:
-  address: "192.168.40.83"
+  address: "192.168.40.168"
   port: 7002
   db: 0
 
@@ -13,10 +13,10 @@ cert_store_server:
   port: 9991
 
 log_kafkabrokers:
-  address: "192.168.40.85:9092"
+  address: "192.168.40.169:9092"
 
 log_minio:
-  address: "192.168.40.85;"
+  address: "192.168.40.168;"
   port: 9090
 
 fs_remote:
@@ -57,7 +57,7 @@ kni:
         enabled: 1
 tfe:
   nr_threads: 32
-  mc_cache_eth: ens1.100
+  mc_cache_eth: lo 
   keykeeper:
     mode: "normal"
     no_cache: 0
@@ -74,7 +74,7 @@ nic_data_incoming:
   name: tun_kni
   address: 127.0.0.1
 nic_inner_ctrl:
-  name: lo
+  name: eth0.100
 nic_traffic_mirror:
   name: lo
   use_mrzcpd: 0
diff --git a/pc_double_arm_access/hosts b/pc_double_arm_access/hosts
index 9b78356..7cc25b6 100644
--- a/pc_double_arm_access/hosts
+++ b/pc_double_arm_access/hosts
@@ -3,4 +3,4 @@ ansible_user=root
 package_source=local
 
 [pc-as-tun-mode]
-192.168.40.139
+192.168.40.138
diff --git a/roles/cert-redis/files/cert-redis/6379/6379.conf b/roles/cert-redis/files/cert-redis/6379/6379.conf
index 82ea651..d17e213 100644
--- a/roles/cert-redis/files/cert-redis/6379/6379.conf
+++ b/roles/cert-redis/files/cert-redis/6379/6379.conf
@@ -147,7 +147,7 @@ supervised no
 #
 # Creating a pid file is best effort: if Redis is not able to create it
 # nothing bad happens, the server will start and run normally.
-pidfile /var/run/redis_7001.pid
+pidfile /var/run/redis_6379.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -160,7 +160,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile "/home/ceiec/maat-redis/7001/7001.log"
+logfile "/home/tsg/cert-redis/6379/6379.log"
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -244,7 +244,7 @@ dbfilename dump.rdb
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.
-dir /home/ceiec/maat-redis/7001/
+dir /home/tsg/cert-redis/6379/
 
 ################################# REPLICATION #################################
 
diff --git a/roles/cert-redis/files/cert-redis/start-cert-redis b/roles/cert-redis/files/cert-redis/start-cert-redis
index 8ca068a..3b2f836 100755
--- a/roles/cert-redis/files/cert-redis/start-cert-redis
+++ b/roles/cert-redis/files/cert-redis/start-cert-redis
@@ -1,4 +1,4 @@
 #!/bin/bash
 #
 
-/usr/local/bin/redis-server /home/ceiec/cert-redis/6379/6379.conf
+/usr/local/bin/redis-server /home/tsg/cert-redis/6379/6379.conf
diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2
index d9395db..7f86908 100644
--- a/roles/kni/templates/kni.conf.j2
+++ b/roles/kni/templates/kni.conf.j2
@@ -28,6 +28,7 @@ enabled = 1
 dev_eth_symbol = {{ nic_to_tfe.tfe2.name }}
 ip_addr = 192.168.100.4
 {% endif %}
+
 [tfe_cmsg_receiver]
 listen_eth = {{ nic_inner_ctrl.name }}
 listen_port = 2475
diff --git a/roles/tsg-env-tun-mode/tasks/main.yml b/roles/tsg-env-tun-mode/tasks/main.yml
index 603e94c..2678a92 100644
--- a/roles/tsg-env-tun-mode/tasks/main.yml
+++ b/roles/tsg-env-tun-mode/tasks/main.yml
@@ -4,9 +4,14 @@
     src: "{{ role_path }}/files/vconfig-1.9-16.el7.x86_64.rpm"
     dest: /tmp
 
+- name: "create /opt/tsg/env"
+  file:
+    path: /opt/tsg/env
+    state: directory
+
 - name: "template setup script"
   template:
-    src: "{{ role_path }}/files/setup.j2"
+    src: "{{ role_path }}/templates/setup.j2"
     dest: "/opt/tsg/env/setup"   
     mode: 0755   
 
@@ -18,7 +23,7 @@
 
 - name: "template tsg-env_stop"
   template:
-    src: "{{ role_path }}/files/tsg-env_stop.j2"
+    src: "{{ role_path }}/templates/tsg-env_stop.j2"
     dest: "/opt/tsg/env/tsg-env_stop"   
     mode: 0755