summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzhihan <[email protected]>2020-04-01 10:31:23 +0800
committerzhangzhihan <[email protected]>2020-04-01 10:31:23 +0800
commitbeb4590a5d1576af6e839423d6235734b1dd97e1 (patch)
treeeadbc5d8607b3318db9c5ed0b19251b49c3a4f2a
parent6e8fd6579768bed075ca9ab92fdf8dbca68e16f5 (diff)
优化双臂模式部署
-rw-r--r--roles/firewall/tasks/main.yml14
-rw-r--r--roles/firewall/templates/maat.conf.j2 (renamed from roles/sapp/templates/maat.conf.j2)0
-rw-r--r--roles/firewall/templates/main.conf.j2 (renamed from roles/sapp/templates/main.conf.j2)0
-rw-r--r--roles/sapp/tasks/main.yml18
4 files changed, 19 insertions, 13 deletions
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 8ffef49..df9a0af 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -73,3 +73,17 @@
- /tmp/ansible_deploy/tsg_master-debug-1.0.1.f624b67-1.el7.centos.x86_64.rpm
state: present
when: install_tsg_master == "yes"
+
+- name: Template the tsgconf/main.conf
+ template:
+ src: "{{ role_path }}/templates/main.conf.j2"
+ dest: /home/mesasoft/sapp_run/tsgconf/main.conf
+ tags: template
+
+
+- name: Template the tsgconf/maat.conf
+ template:
+ src: "{{ role_path }}/templates/maat.conf.j2"
+ dest: /home/mesasoft/sapp_run/tsgconf/maat.conf
+ tags: template
+
diff --git a/roles/sapp/templates/maat.conf.j2 b/roles/firewall/templates/maat.conf.j2
index f723e36..f723e36 100644
--- a/roles/sapp/templates/maat.conf.j2
+++ b/roles/firewall/templates/maat.conf.j2
diff --git a/roles/sapp/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2
index 2e3b994..2e3b994 100644
--- a/roles/sapp/templates/main.conf.j2
+++ b/roles/firewall/templates/main.conf.j2
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index 131d5b1..54b70b4 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -10,6 +10,11 @@
- /tmp/ansible_deploy/sapp-4.0.5.3385992-1.el7.x86_64.rpm
state: present
+- name: make dir
+ file:
+ path: /home/mesasoft/sapp_run/tsgconf
+ state: directory
+
- name: Template the sapp.toml
template:
src: "{{ role_path }}/templates/sapp.toml.j2"
@@ -34,19 +39,6 @@
dest: /home/mesasoft/sapp_run/etc/gdev.conf
tags: template
-- name: Template the tsgconf/main.conf
- template:
- src: "{{ role_path }}/templates/main.conf.j2"
- dest: /home/mesasoft/sapp_run/tsgconf/main.conf
- tags: template
-
-
-- name: Template the tsgconf/maat.conf
- template:
- src: "{{ role_path }}/templates/maat.conf.j2"
- dest: /home/mesasoft/sapp_run/tsgconf/maat.conf
- tags: template
-
- name: "enable sapp"
systemd:
name: sapp