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.

12 files changed, 15 insertions, 12 deletions

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
--- 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_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
--- 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
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
--- 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
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
--- 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
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
--- 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_core/task/main.yml b/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
--- 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
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
index 4a027d2..4a027d2 100644
--- a/roles/oam_snmp/templates/application.properties
+++ b/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
index b9156d2..076098f 100644
--- 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