Merge branch 'master' of git.mesalab.cn:zhangzhihan/device-management-scripts into oam_20200407

2020-04-08 15:50:20 +08:00
parent aca4de7ec3 da56084479
commit b76d267504
5 changed files with 2 additions and 4 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- 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/
--- 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



--- 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



--- a/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm
+++ b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm