diff --git a/host_40.170/group_vars/all.yml b/host_40.170/group_vars/all.yml new file mode 100644 index 0000000..9298cbc --- /dev/null +++ b/host_40.170/group_vars/all.yml @@ -0,0 +1,13 @@ +influxdb: + cluster_ip: "192.168.40.210" + +consul: + datacenter: consul-xxg + dckey: "XwXLAbVN1C44dLUVJ6UL5A==" + cluster_ip: "192.168.40.210" + cluster_ethname: ens33 + external_ethname: ens33 + internal_ethname: ens33 + +mariadb: + password: 111111 diff --git a/host_40.170/group_vars/blade-00.yml b/host_40.170/group_vars/blade-00.yml new file mode 100644 index 0000000..c7a4ad8 --- /dev/null +++ b/host_40.170/group_vars/blade-00.yml @@ -0,0 +1,10 @@ +influxdb: + cluster_agent: "no" + cluster_ip: "192.168.40.210" + mcn0_agent: "yes" + meta_dir: /var/lib/influxdb/meta + data_dir: /var/lib/influxdb/data + wal_dir: /var/lib/influxdb/wal-dir + +grafana: + http_port: 53000 diff --git a/host_40.170/group_vars/cluster_server.yml b/host_40.170/group_vars/cluster_server.yml new file mode 100644 index 0000000..7d69281 --- /dev/null +++ b/host_40.170/group_vars/cluster_server.yml @@ -0,0 +1,7 @@ +influxdb: + cluster_agent: "yes" + mcn0_agent: "no" + meta_dir: /var/lib/influxdb/meta + data_dir: /var/lib/influxdb/data + wal_dir: /var/lib/influxdb/wal-dir + diff --git a/host_40.170/hosts b/host_40.170/hosts new file mode 100644 index 0000000..d884352 --- /dev/null +++ b/host_40.170/hosts @@ -0,0 +1,48 @@ +[all:vars] +ansible_user=root +use_chassis_hardware_sn=false +rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm + + +[blade-mxn] +192.168.40.170 + +[blade-00] +192.168.40.166 server_ip=172.16.124.133 + +[blade-01] +192.168.40.167 server_ip=172.16.124.133 + +[blade-02] +192.168.40.168 server_ip=172.16.124.133 + +[blade-03] +192.168.40.169 server_ip=172.16.124.133 + +[sled-mxn] +192.168.40.170 SN=CBT2201925000003 mcn0_ip=192.168.40.166 + +[sled-mcn0] +192.168.40.166 SN=CBT2201925000003 + +[sled-mcn1] +192.168.40.167 SN=CBT2201925000003 + +[sled-mcn2] +192.168.40.168 SN=CBT2201925000003 + +[sled-mcn3] +192.168.40.169 SN=CBT2201925000003 + +[Functional_Host:children] +sled-mcn0 +sled-mcn1 +sled-mcn2 +sled-mcn3 + +[tsg-all:children] +sled-mxn +sled-mcn0 +sled-mcn1 +sled-mcn2 +sled-mcn3 diff --git a/install_oam_for_40.170.yml b/install_oam_for_40.170.yml new file mode 100644 index 0000000..973b81b --- /dev/null +++ b/install_oam_for_40.170.yml @@ -0,0 +1,32 @@ +--- +- hosts: sled-mxn + roles: + - tsg-cli-mxn + - oam_cli_agent_mxn + - oam_cli + - oam_core + - oam_snmp + +- hosts: sled-mcn0 + roles: + - tsg-cli-mcn0 + - oam_cli_agent + +- hosts: sled-mcn1 + roles: + - tsg-cli-mcn1 + - oam_cli_agent + +- hosts: sled-mcn2 + roles: + - tsg-cli-mcn2 + - oam_cli_agent + +- hosts: sled-mcn3 + roles: + - tsg-cli-mcn3 + - oam_cli_agent + +- hosts: sled-mxn + roles: + - oam_core_start diff --git a/lijia_update_note.txt b/lijia_update_note.txt new file mode 100644 index 0000000..9f93ea1 --- /dev/null +++ b/lijia_update_note.txt @@ -0,0 +1,4 @@ +2020-03-13 lijia update +1-更新oam, tsg-cli模块的rpm包 +2-修改roles/oam_cli/tasks/main.yml, Templates application.properties的路径错误. +3-修改roles/oam_core/task目录名称错误，改为tasks. \ No newline at end of file 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 ca061a0..6150768 100644 Binary files a/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm and b/roles/oam_cli/files/oam_cli-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_cli/tasks/main.yml b/roles/oam_cli/tasks/main.yml index b109b46..b3abc5d 100644 --- a/roles/oam_cli/tasks/main.yml +++ b/roles/oam_cli/tasks/main.yml @@ -12,5 +12,5 @@ - name: "Templates application.properties" template: src: "{{role_path}}/templates/application.properties.j2" - dest: /opt/tsg/oam_cli/application.properties + dest: /opt/tsg/cli/application.properties tags: template diff --git a/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm b/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm index 82564c5..8360ed2 100644 Binary files a/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm and b/roles/oam_cli_agent/files/oam_cli_agent-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_cli_agent/tasks/main.yml b/roles/oam_cli_agent/tasks/main.yml index c0fb8d7..e9d584a 100644 --- a/roles/oam_cli_agent/tasks/main.yml +++ b/roles/oam_cli_agent/tasks/main.yml @@ -11,7 +11,8 @@ - name: "bak snmpd.conf" shell: cp -rf /usr/share/snmp/snmpd.conf /usr/share/snmp/snmpd.conf_origin - + ignore_errors: yes + - name: "Templates snmpd.conf" template: src: "{{role_path}}/templates/snmpd.conf" diff --git a/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm b/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm index 0a4274c..131c9fb 100644 Binary files a/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm and b/roles/oam_cli_agent_mxn/files/oam_cli_agent_mxn-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm index 626e01c..da61c66 100644 Binary files a/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm and b/roles/oam_cluster/files/oam_cluster-1.0-1.0.x86_64.rpm differ 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 4e37a8c..27de970 100644 Binary files a/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm and b/roles/oam_core/files/oam_core-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_core/task/main.yml b/roles/oam_core/tasks/main.yml similarity index 78% rename from roles/oam_core/task/main.yml rename to roles/oam_core/tasks/main.yml index d621744..8a78a61 100644 --- a/roles/oam_core/task/main.yml +++ b/roles/oam_core/tasks/main.yml @@ -1,7 +1,8 @@ +--- - name: "copy oam_core.rpm to destination server" - copy: - src: "{{ role_path }}/files/" - dest: /tmp + synchronize: + src: "{{ role_path }}/files/oam_core-1.0-1.0.x86_64.rpm" + dest: "/tmp/" - name: "install oam_core" yum: diff --git a/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm b/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm index 143b57c..913f688 100644 Binary files a/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm and b/roles/oam_snmp/files/oam_snmp-1.0-1.0.x86_64.rpm differ diff --git a/roles/oam_snmp/tasks/main.yml b/roles/oam_snmp/tasks/main.yml index 263e27d..3dff0f7 100644 --- a/roles/oam_snmp/tasks/main.yml +++ b/roles/oam_snmp/tasks/main.yml @@ -9,10 +9,10 @@ - /tmp/oam_snmp-1.0-1.0.x86_64.rpm state: present -- name: "Templates application-centos2.properties" +- name: "Templates application.properties" template: src: "{{role_path}}/templates/application.properties.j2" - dest: /opt/tsg/oam_snmp/application.properties + dest: /opt/tsg/snmp/application.properties tags: template - name: "Start oam_snmp" @@ -30,8 +30,9 @@ dest: /etc/snmp/snmpd.conf tags: template -- name: "Start snmpd" - systemd: - name: snmpd - state: restarted - enabled: yes +#- name: "Start snmpd" +# systemd: +# name: snmpd +# state: restarted +# enabled: yes +# ignore_errors: yes \ No newline at end of file diff --git a/roles/oam_snmp/templates/application.properties b/roles/oam_snmp/templates/application.properties.j2 similarity index 100% rename from roles/oam_snmp/templates/application.properties rename to roles/oam_snmp/templates/application.properties.j2 diff --git a/roles/tsg-common-files/tsg-cli-1.0.13.c6d5037-1.el7.x86_64.rpm b/roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm similarity index 88% rename from roles/tsg-common-files/tsg-cli-1.0.13.c6d5037-1.el7.x86_64.rpm rename to roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm index b9156d2..076098f 100644 Binary files a/roles/tsg-common-files/tsg-cli-1.0.13.c6d5037-1.el7.x86_64.rpm and b/roles/tsg-common-files/tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm differ diff --git a/test_host/hosts b/test_host/hosts index 5e3cd0d..a0addea 100644 --- a/test_host/hosts +++ b/test_host/hosts @@ -1,7 +1,7 @@ [all:vars] ansible_user=root use_chassis_hardware_sn=true -rpm_file_name=tsg-cli-1.0.13.c6d5037-1.el7.x86_64.rpm +rpm_file_name=tsg-cli-1.0.14.eccfd07-1.el7.x86_64.rpm [cluster_server] 172.16.124.134 diff --git a/uninstall_oam_for_40.170.yml b/uninstall_oam_for_40.170.yml new file mode 100644 index 0000000..8c7b8e9 --- /dev/null +++ b/uninstall_oam_for_40.170.yml @@ -0,0 +1,62 @@ +--- +- hosts: tsg-all + tasks: + - name: "stop tsg-monitor service" + service: + name: tsg-monitor + state: stopped + ignore_errors: yes + + - 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_agent_mxn service" + service: + name: oam_cli_agent_mxn + state: stopped + ignore_errors: yes + + - name: "stop oam_cli_agent service" + service: + name: oam_cli_agent + 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 + + - name: "uninstall oam_core" + yum: + name: "oam_core" + state: absent + + - name: "uninstall oam_snmp" + yum: + name: "oam_snmp" + state: absent + + - name: "uninstall oam_cli" + yum: + name: "oam_cli" + state: absent + + - name: "uninstall oam_cli_agent_mxn" + yum: + name: "oam_cli_agent_mxn" + state: absent \ No newline at end of file