summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzh <[email protected]>2020-01-17 01:18:04 +0800
committerzhangzh <[email protected]>2020-01-17 01:18:04 +0800
commitab27775a69364a22e19c85f92a0f232e18a99f22 (patch)
tree52298f14e97bafb15cbcf46ec4de165bb1b662be
parent19317a1e4737e35e552d5b97684cb1299137504a (diff)
update deploy.yml
-rw-r--r--.DS_Storebin0 -> 8196 bytes
-rw-r--r--adc_inline_device_access/group_vars/all.yml1
-rw-r--r--adc_tera_access/group_vars/all.yml1
-rw-r--r--deploy.yml4
-rw-r--r--pc_double_arm_access/group_vars/all.yml1
-rw-r--r--roles/.DS_Storebin0 -> 8196 bytes
-rw-r--r--roles/sapp/.DS_Storebin0 -> 6148 bytes
-rw-r--r--roles/tfe/.DS_Storebin0 -> 6148 bytes
-rw-r--r--roles/tfe/templates/tfe.conf.j22
-rw-r--r--roles/tsg-env-mcn0/.DS_Storebin0 -> 6148 bytes
10 files changed, 7 insertions, 2 deletions
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..6bf65d5
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/adc_inline_device_access/group_vars/all.yml b/adc_inline_device_access/group_vars/all.yml
index f3ffcc0..2bff0fe 100644
--- a/adc_inline_device_access/group_vars/all.yml
+++ b/adc_inline_device_access/group_vars/all.yml
@@ -60,7 +60,6 @@ kni:
enabled: 1
tfe:
nr_threads: 16
- kni_ip: 192.168.100.1
mc_cache_eth: ens1.100
keykeeper:
mode: "normal"
diff --git a/adc_tera_access/group_vars/all.yml b/adc_tera_access/group_vars/all.yml
index 86c83d7..2bff0fe 100644
--- a/adc_tera_access/group_vars/all.yml
+++ b/adc_tera_access/group_vars/all.yml
@@ -60,6 +60,7 @@ kni:
enabled: 1
tfe:
nr_threads: 16
+ mc_cache_eth: ens1.100
keykeeper:
mode: "normal"
no_cache: 0
diff --git a/deploy.yml b/deploy.yml
index 4dda93e..fc424b3 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -7,7 +7,9 @@
roles:
- tsg-env-mcn0
- mrzcpd
+ - sapp
- kni
+ - firewall
- certstore
- hosts: blade-01
@@ -36,6 +38,8 @@
roles:
- mrzcpd
- framework
+ - sapp
- kni
+ - firewall
- certstore
- tfe
diff --git a/pc_double_arm_access/group_vars/all.yml b/pc_double_arm_access/group_vars/all.yml
index 69c8fc0..5d548ae 100644
--- a/pc_double_arm_access/group_vars/all.yml
+++ b/pc_double_arm_access/group_vars/all.yml
@@ -54,6 +54,7 @@ kni:
enabled: 1
tfe:
nr_threads: 32
+ mc_cache_eth: ens1.100
keykeeper:
mode: "normal"
no_cache: 0
diff --git a/roles/.DS_Store b/roles/.DS_Store
new file mode 100644
index 0000000..d143f6e
--- /dev/null
+++ b/roles/.DS_Store
Binary files differ
diff --git a/roles/sapp/.DS_Store b/roles/sapp/.DS_Store
new file mode 100644
index 0000000..d9873f0
--- /dev/null
+++ b/roles/sapp/.DS_Store
Binary files differ
diff --git a/roles/tfe/.DS_Store b/roles/tfe/.DS_Store
new file mode 100644
index 0000000..034aba2
--- /dev/null
+++ b/roles/tfe/.DS_Store
Binary files differ
diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2
index 08fa194..ad93052 100644
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -6,7 +6,7 @@ breakpad_minidump_dir=/run/tfe/crashreport/
breakpad_upload_url=http://127.0.0.1:9000/
[kni]
-ip={{ tfe.kni_ip }}
+ip=192.168.100.1
scm_port=2475
watchdog_switch=1
watchdog_port=2476
diff --git a/roles/tsg-env-mcn0/.DS_Store b/roles/tsg-env-mcn0/.DS_Store
new file mode 100644
index 0000000..f0b0a41
--- /dev/null
+++ b/roles/tsg-env-mcn0/.DS_Store
Binary files differ