更新oam rpm包

11 files changed, 2 insertions, 4 deletions

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..49a13ce
--- /dev/null
+++ b/.DS_Store
diff --git a/roles/consul-cluster/files/consul-cluster/install.sh b/roles/consul-cluster/files/consul-cluster/install.sh
index 3ccdddb..34ba446 100755
--- a/roles/consul-cluster/files/consul-cluster/install.sh
+++ b/roles/consul-cluster/files/consul-cluster/install.sh
@@ -4,4 +4,5 @@ rm -rf /usr/lib/systemd/system/consul*service
 rm -rf /usr/lib/systemd/system/consul*service
 rm -rf /var/consul*
 cp -f /opt/consul-cluster/etc/systemd/consul-server.service /usr/lib/systemd/system/consul-server-cluster.service
+cp -f /opt/consul-cluster/bin/consul /usr/bin/
 ln -sf /opt/consul-cluster/script/consul_path_setup.sh /etc/profile.d/
diff --git a/roles/consul-external/files/consul-external/install.sh b/roles/consul-external/files/consul-external/install.sh
index 35a987f..96c1354 100755
--- a/roles/consul-external/files/consul-external/install.sh
+++ b/roles/consul-external/files/consul-external/install.sh
@@ -4,9 +4,8 @@ rm -rf /usr/lib/systemd/system/consul*service
 rm -rf /usr/lib/systemd/system/consul*service
 rm -rf /var/consul*
 cp -f /opt/consul-external/etc/systemd/consul-server.service /usr/lib/systemd/system/consul-server-external.service
-
+cp -f /opt/consul-external/bin/consul /usr/bin/
 ln -sf /opt/consul-external/script/consul_path_setup.sh /etc/profile.d/
-systemctl daemon-reload
 
 
 
diff --git a/roles/consul-internal/files/consul-internal/install.sh b/roles/consul-internal/files/consul-internal/install.sh
index 056065d..ce3a01a 100755
--- a/roles/consul-internal/files/consul-internal/install.sh
+++ b/roles/consul-internal/files/consul-internal/install.sh
@@ -4,9 +4,7 @@ rm -f /usr/lib/systemd/system/consul*service
 rm -f /usr/lib/systemd/system/consul*service
 cp -f /opt/consul-internal/etc/systemd/consul-client.service /usr/lib/systemd/system/consul-client-internal.service
 cp -f /opt/consul-internal/bin/consul /usr/bin/
-
 ln -sf /opt/consul-internal/script/consul_path_setup.sh /etc/profile.d/
-systemctl daemon-reload
 
 
 
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..f64dda8 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_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..c30b36c 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_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..0f47f68 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..c018b05 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..cd16ea4 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/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..fdd7b50 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/telegraf/files/telegraf-1.11.4-1.x86_64.rpm b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm
index 21d3483..0bb3681 100644
--- a/roles/telegraf/files/telegraf-1.11.4-1.x86_64.rpm
+++ b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm