优化部署

8 files changed, 41 insertions, 11 deletions

diff --git a/deploy.yml b/deploy.yml
index ca2173c..8531782 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -5,7 +5,7 @@
 - hosts: cluster_server
   roles:
     - consul-cluster
-    - mariadb
+    #- mariadb
     - influxdb
 
 - hosts: blade-mxn
@@ -20,12 +20,12 @@
 
 - hosts: blade-mcn0
   roles:
-    - mariadb
     - consul-internal
     - telegraf
     - influxdb
     - grafana
     - tsg-cli-mcn0
+    - mariadb
     - oam_cli_agent
 
 - hosts: blade-mcn1
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index dfdd3a7..012e2ee 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,8 +1,14 @@
+- name: "judge mariadb status"
+  shell: systemctl status mariadb.service
+  register: return
+  ignore_errors: true
+
 - name: "del mysql user"
   user:
     name: mysql
     state: absent
     remove: yes
+  when: return.rc != 0
 
 - name: "del mariadb|mysql"
   yum:
@@ -11,19 +17,23 @@
   yum:
     name: mariadb
     state: removed
+  when: return.rc != 0
 
 - name: "copy mysql.zip"
   synchronize:
     src: "{{ role_path }}/files/"
     dest: "/tmp/"
+  when: return.rc != 0
 
 - name: "add mysql user"
   shell: useradd mysql -s /sbin/nologin -M
+  when: return.rc != 0
 
 - name: "mkdir /home/database/"
   file:
     path: /home/database
     state: directory
+  when: return.rc != 0
 
 - name: "mkdir /home/database/dbdata/"
   file:
@@ -31,6 +41,7 @@
     state: directory
     owner: mysql
     group: mysql
+  when: return.rc != 0
 
 - name: "mkdir /var/lib/mysql/"
   file:
@@ -39,57 +50,69 @@
     owner: mysql
     group: mysql
     mode: 1777
+  when: return.rc != 0
 
 - name: "mkdir /etc/mysql/"
   file:
     path: /etc/mysql/
     state: directory
-
+  when: return.rc != 0
+  
 - name: "mkdir /var/log/mariadb/"
   file:
     path: /var/log/mariadb/
     state: directory
+  when: return.rc != 0
 
 - name: "set /tmp permission 1777"
   shell: chmod 1777 /tmp
+  when: return.rc != 0
 
 - name: "unarchive mariadb"
   unarchive:
     src: "/tmp/mysql.zip"
     dest: "/home/database/"
     copy: no
+  when: return.rc != 0
 
 - name: "install libaio-devel"
   yum:
     name:
       - /tmp/libaio-devel-0.3.109-13.el7.x86_64.rpm
     state: present
+  when: return.rc != 0
 
 - name: "init mariadb"
   shell: cd /home/database/mysql/scripts;./mysql_install_db --basedir=/home/database/mysql --datadir=/home/database/dbdata --user=mysql
+  when: return.rc != 0
 
 - name: "set my.cnf"
   copy:
     src: "{{ role_path }}/files/my.cnf"
     dest: "/etc/mysql/my.cnf"
+  when: return.rc != 0
 
 - name: "copy mariadb"
   copy:
     src: "{{ role_path }}/files/mariadb"
     dest: "/etc/init.d/"
     mode: 0755
+  when: return.rc != 0
 
-- name: "copy mariadb.service"
+- name: "copy mariadb_mcn0.service"
   copy:
-    src: "{{ role_path }}/files/mariadb.service"
+    src: "{{ role_path }}/files/mariadb_mcn0.service"
     dest: "/usr/lib/systemd/system/"
     mode: 0755
+  when: return.rc != 0
 
 - name: "copy mysql"
   shell: cp -rf /home/database/mysql/bin/mysql /usr/local/bin
+  when: return.rc != 0
 
 - name: "copy mysqladmin"
   shell: cp -rf /home/database/mysql/bin/mysqladmin /usr/local/bin
+  when: return.rc != 0
 
 - name: "start and enable mariadb"
   systemd:
@@ -97,28 +120,34 @@
     state: started
     enabled: yes
     daemon_reload: yes
+  when: return.rc != 0
 
 - name: "set mariadb password"
   shell: mysqladmin password {{ mariadb.password }}
+  when: return.rc != 0
 
 - name: "set mariadb privileges"
   shell: mysql -uroot -p{{ mariadb.password }} -e "grant all privileges on *.* to root@'%' identified by 'tsg2019' with grant option;"
   shell: mysql -uroot -p{{ mariadb.password }} -e "flush privileges;"
   shell: mysql -uroot -p{{ mariadb.password }} -e "create database tsg_oam"
+  when: return.rc != 0
 
 - name: "get remote tsg sn"
   shell: cat /opt/tsg/etc/tsg_sn.json | grep sn | awk -F "\"" {'print $4'}
   register: adc_tsg_sn
+  when: return.rc != 0
 
 - name: "Templates tsg_threshold.sql"
   template:
     src: "{{role_path}}/templates/tsg_threshold.sql.j2"
     dest: /tmp/tsg-cli-deploy/tsg_threshold.sql
   tags: template
-
+  when: return.rc != 0
 
 - name: "debug show tsg_sn"
   debug: var=adc_tsg_sn.stdout
+  when: return.rc != 0
 
 - name: "import the sql after template"
   shell: mysql -s -h 127.0.0.1 -u {{ mariadb.username }} -p{{ mariadb.password }}  < /tmp/tsg-cli-deploy/tsg_threshold.sql
+  when: return.rc != 0
diff --git a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
index f959b5a..9b38da4 100644
--- a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
+++ b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
index 099f518..85bff26 100644
--- a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
+++ b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm
diff --git a/roles/oam_snmp/templates/application.properties.j2 b/roles/oam_snmp/templates/application.properties.j2
index bd0c308..a54642b 100644
--- a/roles/oam_snmp/templates/application.properties.j2
+++ b/roles/oam_snmp/templates/application.properties.j2
@@ -1,5 +1,5 @@
 oam.influx.url=http://{{ mcn0_ip }}:58086
 oam.influx.db={{ influxdb.dbname }}
-oam.influx.user={{ influxdb.userbname }}
+oam.influx.user={{ influxdb.username }}
 oam.influx.password={{ influxdb.passwd }}
 oam.influx.recentminutes=5
diff --git a/roles/tsg-cli-mcn0/tasks/main.yml b/roles/tsg-cli-mcn0/tasks/main.yml
index 786395b..739e198 100644
--- a/roles/tsg-cli-mcn0/tasks/main.yml
+++ b/roles/tsg-cli-mcn0/tasks/main.yml
@@ -12,7 +12,7 @@
     packages:
     - /tmp/tsg-cli-deploy/{{ rpm_file_name }}
 
-- name: Template the main.conf
+- name: Template the tsg_sn.json 
   template:
     src: "{{ role_path }}/templates/tsg_sn.json.j2"
     dest: /opt/tsg/etc/tsg_sn.json
@@ -59,4 +59,4 @@
     daemon_reload: yes  
     enabled: yes
     state: restarted
-     
\ No newline at end of file
+     
diff --git a/test_host/group_vars/all.yml b/test_host/group_vars/all.yml
index c628c8b..4241b46 100644
--- a/test_host/group_vars/all.yml
+++ b/test_host/group_vars/all.yml
@@ -2,7 +2,7 @@ grafana:
     http_port: 53000
 
 influxdb:
-    cluster_ip: "192.168.40.210"
+    cluster_ip: "192.168.40.210" 
     dbname: tsg_stat
     username: admin
     passwd: tsg2019
@@ -25,3 +25,4 @@ mariadb:
 
 java_version: jdk1.8.0_73
 bifang_api_ip: "192.168.40.4"
+SN: CBT2201925000003
diff --git a/test_host/hosts b/test_host/hosts
index c68ac34..d0e12fd 100644
--- a/test_host/hosts
+++ b/test_host/hosts
@@ -7,7 +7,7 @@ rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm
 192.168.40.210 influxdb_cluster=true
 
 [blade-mxn]
-192.168.40.170 SN=CBT2201925000003 mcn0_ip=192.168.40.166
+192.168.40.170 mcn0_ip=192.168.40.166
 
 [blade-mcn0]
 192.168.40.166 server_ip=192.168.40.170