设备管理21.01临时版本，oam-core和oam-snmp还未更新

20201121_inc_update.yml

@@ -1,31 +0,0 @@
-- hosts: blade-mxn
-  roles:
-    - tsg-cli-mxn
-    - oam_cli_agent_mxn
-    - oam_core
-
-- hosts: blade-mcn0
-  roles:
-    - tsg-cli-mcn0
-    - setup_mariadb
-    - oam_cli_agent
-
-- hosts: blade-mcn1
-  roles:
-    - tsg-cli-mcn1
-    - oam_cli_agent
-
-- hosts: blade-mcn2
-  roles:
-    - tsg-cli-mcn2
-    - oam_cli_agent
-
-- hosts: blade-mcn3
-  roles:
-    - tsg-cli-mcn3
-    - oam_cli_agent
-
-- hosts: blade-mxn
-  roles:
-    - oam_mxn_start
-

cluster_deploy.yml

@@ -2,8 +2,7 @@
   roles:
     - oam_cluster
     - consul-cluster
-    # mariadb复用毕方
-    #- mariadb
+    - mariadb
     - influxdb
     - ha_master
 
@@ -11,8 +10,7 @@
   roles:
     - oam_cluster
     - consul-cluster
-    # mariadb复用毕方
-    #- mariadb
+    - mariadb
     - influxdb
     - ha_backup
 

install_config/group_vars/all.yml

@@ -28,7 +28,7 @@ consul:
 
 mariadb:
     username: root
-    password: 111111
+    password: tsg2019
     cluster_password: tsg369258
     cluster_ip: "10.4.62.251"
 
@@ -67,7 +67,7 @@ ha_backup:
     oam_virtual_router_id: 54
     
 java_version: jdk1.8.0_73
-bifang_api_ip: "10.4.62.252"
+bifang_api_ip: "192.168.44.71"
 bifang_api_port: 8080
 
 tag_location: "Nur-sultan"

roles/mariadb/files/my.cnf

@@ -19,45 +19,78 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /tmp/mysql.sock 
+socket		= /var/lib/mysql/mysql.sock
+default-character-set = utf8mb4
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
+basedir=/home/cries/mysql
+datadir=/home/cries/dbdata
+#timezone test
+#default-time_zone = '+6:00'
+#relay_log=/home/ceiec/mariadb/binlogs/master-bin/relay-log
+#log_bin=/home/ceiec/mariadb/relaylogs/relay-bin/master-log
+binlog_format=mixed
+auto-increment-offset=1
+auto-increment-increment=2
+log_bin_trust_function_creators=1
+log_slave_updates=true
+sync_binlog=0
+binlog-checksum=CRC32
+master-verify-checksum=1
+slave-sql-verify-checksum=1
+slave-skip-errors=all
+relay_log_recovery=1
+port		= 3306
+#datadir         = /home/dbdata
+innodb_file_per_table = on
+skip_name_resolve = on
+lower_case_table_names = 1
+character-set-server = utf8mb4
+character-set-client-handshake = FALSE
+#slow_query_log_file = /home/mariadb/logs/slow_query.log
+#log_error = /home/mariadb/host01.err
+socket		= /var/lib/mysql/mysql.sock
 skip-external-locking
-thread_stack = 256K 
-table_cache = 128K 
-sort_buffer_size = 6M 
+back_log = 384
+key_buffer_size = 256M
+max_allowed_packet = 4M
+table_open_cache = 512
+thread_stack = 256K
+table_cache = 128K
+sort_buffer_size = 6M
 read_buffer_size = 4M
-read_rnd_buffer_size = 8M 
-myisam_sort_buffer_size = 64M 
-thread_cache_size = 8 
-query_cache_size = 32M 
+read_rnd_buffer_size = 8M
+myisam_sort_buffer_size = 64M
+thread_cache_size = 8
+query_cache_size = 32M
 join_buffer_size = 8M
-# Try number of CPU's*2 for thread_concurrency 
+# Try number of CPU's*2 for thread_concurrency
 thread_concurrency = 8
 wait_timeout=2880000
-interactive_timeout = 2880000 
+interactive_timeout = 2880000
 max_allowed_packet = 200M
-max_connections = 1500 
-open-files-limit = 10240
-key_buffer_size=256M
-back_log = 512 
-table_open_cache=2048 
-innodb_file_per_table= 1 
-innodb_buffer_pool_size = 2048M 
-innodb_log_file_size = 1024M 
-innodb_log_buffer_size = 16M 
-innodb_flush_log_at_trx_commit = 2 
-innodb_flush_method = 'O_DIRECT' 
-innodb_max_dirty_pages_pct = 90
-innodb_log_file_size = 100M 
-innodb_log_buffer_size = 1G 
-innodb_buffer_pool_instances = 1 
-innodb_flush_log_at_trx_commit = 1
 
-# Try number of CPU's*2 for thread_concurrency
+max_connections = 1500
+open-files-limit = 10240
+
+
+key_buffer_size=256M
+back_log = 512
+table_open_cache=2048
+
+innodb_file_per_table= 1
+innodb_buffer_pool_size = 2048M
+
+innodb_log_file_size = 1024M
+innodb_log_buffer_size = 16M
+
+innodb_flush_log_at_trx_commit = 2
+innodb_flush_method = 'O_DIRECT'
+
+innodb_max_dirty_pages_pct = 90
 
 # Point the following paths to a dedicated disk
 #tmpdir		= /tmp/
@@ -145,10 +178,11 @@ server-id	= 1
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M
 # Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 100M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
+innodb_log_file_size = 100M
+innodb_log_buffer_size = 1G
+innodb_buffer_pool_instances  = 1
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
 
 [mysqldump]
 quick

roles/mariadb/tasks/main.yml

@@ -114,6 +114,11 @@
   shell: cp -rf /home/database/mysql/bin/mysqladmin /usr/local/bin
   when: return.rc != 0
 
+- name: "copy my.cnf"
+  copy:
+    src: "{{ role_path }}/files/my.cnf"
+    dest: /etc/mysql/my.cnf
+
 - name: "start and enable mariadb"
   systemd:
     name: mariadb

roles/setup_mariadb/files/my.cnf

@@ -0,0 +1,203 @@
+# Example MariaDB config file for very large systems.
+#
+# This is for a large system with memory of 1G-2G where the system runs mainly
+# MariaDB.
+#
+# MariaDB programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, do:
+# 'my_print_defaults --help' and see what is printed under
+# Default options are read from the following files in the given order:
+# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html
+#
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
+
+# The following options will be passed to all MySQL clients
+[client]
+#password	= your_password
+port		= 3306
+socket		= /var/lib/mysql/mysql.sock
+default-character-set = utf8mb4
+
+# Here follows entries for some specific programs
+
+# The MySQL server
+[mysqld]
+basedir=/home/cries/mysql
+datadir=/home/cries/dbdata
+#timezone test
+#default-time_zone = '+6:00'
+#relay_log=/home/ceiec/mariadb/binlogs/master-bin/relay-log
+#log_bin=/home/ceiec/mariadb/relaylogs/relay-bin/master-log
+binlog_format=mixed
+auto-increment-offset=1
+auto-increment-increment=2
+log_bin_trust_function_creators=1
+log_slave_updates=true
+sync_binlog=0
+binlog-checksum=CRC32
+master-verify-checksum=1
+slave-sql-verify-checksum=1
+slave-skip-errors=all
+relay_log_recovery=1
+port		= 3306
+#datadir         = /home/dbdata
+innodb_file_per_table = on
+skip_name_resolve = on
+lower_case_table_names = 1
+character-set-server = utf8mb4
+character-set-client-handshake = FALSE
+#slow_query_log_file = /home/mariadb/logs/slow_query.log
+#log_error = /home/mariadb/host01.err
+socket		= /var/lib/mysql/mysql.sock
+skip-external-locking
+back_log = 384
+key_buffer_size = 256M
+max_allowed_packet = 4M
+table_open_cache = 512
+thread_stack = 256K
+table_cache = 128K
+sort_buffer_size = 6M
+read_buffer_size = 4M
+read_rnd_buffer_size = 8M
+myisam_sort_buffer_size = 64M
+thread_cache_size = 8
+query_cache_size = 32M
+join_buffer_size = 8M
+# Try number of CPU's*2 for thread_concurrency
+thread_concurrency = 8
+wait_timeout=2880000
+interactive_timeout = 2880000
+max_allowed_packet = 200M
+
+max_connections = 1500
+open-files-limit = 10240
+
+
+key_buffer_size=256M
+back_log = 512
+table_open_cache=2048
+
+innodb_file_per_table= 1
+innodb_buffer_pool_size = 2048M
+
+innodb_log_file_size = 1024M
+innodb_log_buffer_size = 16M
+
+innodb_flush_log_at_trx_commit = 2
+innodb_flush_method = 'O_DIRECT'
+
+innodb_max_dirty_pages_pct = 90
+
+# Point the following paths to a dedicated disk
+#tmpdir		= /tmp/
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "enable-named-pipe" option) will render mysqld useless!
+# 
+#skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
+log-bin=mysql-bin
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+server-id	= 1
+
+# Replication Slave (comment out master section to use this)
+#
+# To configure this host as a replication slave, you can choose between
+# two methods :
+#
+# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
+#    the syntax is:
+#
+#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
+#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
+#
+#    where you replace <host>, <user>, <password> by quoted strings and
+#    <port> by the master's port number (3306 by default).
+#
+#    Example:
+#
+#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
+#    MASTER_USER='joe', MASTER_PASSWORD='secret';
+#
+# OR
+#
+# 2) Set the variables below. However, in case you choose this method, then
+#    start replication for the first time (even unsuccessfully, for example
+#    if you mistyped the password in master-password and the slave fails to
+#    connect), the slave will create a master.info file, and any later
+#    change in this file to the variables' values below will be ignored and
+#    overridden by the content of the master.info file, unless you shutdown
+#    the slave server, delete master.info and restart the slaver server.
+#    For that reason, you may want to leave the lines below untouched
+#    (commented) and instead use CHANGE MASTER TO (see above)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin=mysql-bin
+#
+# binary logging format - mixed recommended 
+#binlog_format=mixed
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /usr/local/mysql/data
+#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
+#innodb_log_group_home_dir = /usr/local/mysql/data
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 384M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 100M
+innodb_log_buffer_size = 1G
+innodb_buffer_pool_instances  = 1
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[myisamchk]
+key_buffer_size = 256M
+sort_buffer_size = 256M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout

roles/setup_mariadb/tasks/main.yml

@@ -3,9 +3,9 @@
   register: return
   ignore_errors: true
 
-#- name: "set tsg_oam database"
-#  shell: mysql -uroot -p{{ mariadb.password }} -e "create database tsg_oam"
-  #when: return.rc != 0
+- name: "set tsg_oam database"
+  shell: mysql -uroot -p{{ mariadb.password }} -e "create database tsg_oam"
+  when: return.rc != 0
 
 - name: "Templates tsg_threshold.sql"
   template:
@@ -15,3 +15,14 @@
 
 - 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
+
+- name: "copy my.cnf"
+  copy:
+    src: "{{ role_path }}/files/my.cnf"
+    dest: /etc/mysql/my.cnf
+
+- name: "restart mariadb.service"
+  systemd:
+    name: mariadb
+    state: restarted
+    enable: yes

roles/tsg-cli-mcn0/tasks/main.yml

@@ -61,6 +61,7 @@
   synchronize:
     src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
     dest: "/opt/tsg/tsg-monitor/"
+    mode: 0755
     
 
 - name: "restart rsyslog service"

roles/tsg-cli-mcn1/tasks/main.yml

@@ -61,6 +61,7 @@
   synchronize:
     src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
     dest: "/opt/tsg/tsg-monitor/"
+    mode: 0755
     
 - name: "restart rsyslog service"
   systemd:

roles/tsg-cli-mcn2/tasks/main.yml

@@ -61,6 +61,7 @@
   synchronize:
     src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
     dest: "/opt/tsg/tsg-monitor/"
+    mode: 0755
     
 - name: "restart rsyslog service"
   systemd:

roles/tsg-cli-mcn3/tasks/main.yml

@@ -61,6 +61,7 @@
   synchronize:
     src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
     dest: "/opt/tsg/tsg-monitor/"
+    mode: 0755
     
 - name: "restart rsyslog service"
   systemd:

roles/tsg-cli-mxn/tasks/main.yml

@@ -79,7 +79,6 @@
     src: "{{ role_path }}/files/tsg-monitor.service"
     dest: "/usr/lib/systemd/system"
     
-#2020-11-13 lijia add
 - name: "copy tsg_cluster_register.service to destination server"
   synchronize:
     src: "{{ role_path }}/files/tsg_cluster_register.service"
@@ -100,6 +99,7 @@
   synchronize:
     src: "{{ role_path }}/../tsg-common-files/tsg_monitor_cleanup_tmp.sh"
     dest: "/opt/tsg/tsg-monitor/"
+    mode: 0755
     
 - name: "restart rsyslog service"
   systemd:

uninstall.yml

@@ -1,79 +0,0 @@
----
-- hosts: blade-mxn
-  tasks:
-    - name: "stop oam_core.service"
-      service:
-        name: oam_core
-        state: stopped
-      ignore_errors: yes 
-      
-    - name: "stop oam_snmp service"
-      service:
-        name: oam_snmp
-        state: stopped
-      ignore_errors: yes
-
-    - name: "stop oam_cli service"
-      service:
-        name: oam_cli
-        state: stopped
-      ignore_errors: yes
-      
-    - name: "stop oam_cli_agent_mxn service"
-      service:
-        name: oam_cli_agent_mxn
-        state: stopped
-      ignore_errors: yes
-      
-    - name: "stop consul-server-external service"
-      service:
-        name: consul-server-external
-        state: stopped
-      ignore_errors: yes 
-      
-      
-    - name: "uninstall oam_core"
-      yum:
-        name: "oam_core"
-        state: absent           
-
-    - name: "uninstall oam_cli"
-      yum:
-        name: "oam_cli"
-        state: absent   
-
-    - name: "uninstall oam_snmp"
-      yum:
-        name: "oam_snmp"
-        state: absent     
-        
-    - name: "uninstall oam_cli_agent_mxn"
-      yum:
-        name: "oam_cli_agent_mxn"
-        state: absent           
-     
-
-    - name: "uninstall tsg-cli"
-      yum:
-        name: "tsg-cli"
-        state: absent  
-        
-
-- hosts: all
-  tasks:
-    - name: "stop tsg-monitor service"
-      service:
-        name: tsg-monitor
-        state: stopped
-      ignore_errors: yes     
-      
-    - name: "uninstall tsg-cli"
-      yum:
-        name: "tsg-cli"
-        state: absent   
-
-    - name: "uninstall oam_cli_agent"
-      yum:
-        name: "oam_cli_agent"
-        state: absent    
-        

uninstall_oam_core.yml

@@ -1,13 +0,0 @@
----
-- hosts: blade-mxn
-  tasks:
-    - name: "stop oam_core.service"
-      service:
-        name: oam_core
-        state: stopped
-      ignore_errors: yes 
-      
-    - name: "uninstall oam_core"
-      yum:
-        name: "oam_core"
-        state: absent