diff options
| author | lijia <[email protected]> | 2020-04-08 15:50:20 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2020-04-08 15:50:20 +0800 |
| commit | b76d26750401cf63642f355cbc93fa09c75603bd (patch) | |
| tree | 439139910e72c02147893498c31c29c1ef4509dc | |
| parent | aca4de7ec302ff95ae240ee6a8f199afda984dd4 (diff) | |
| parent | da56084479ff92aa9bf35f38af7bf0bf8c9730dc (diff) | |
Merge branch 'master' of git.mesalab.cn:zhangzhihan/device-management-scripts into oam_20200407
| -rw-r--r-- | .DS_Store | bin | 0 -> 8196 bytes | |||
| -rwxr-xr-x | roles/consul-cluster/files/consul-cluster/install.sh | 1 | ||||
| -rwxr-xr-x | roles/consul-external/files/consul-external/install.sh | 3 | ||||
| -rwxr-xr-x | roles/consul-internal/files/consul-internal/install.sh | 2 | ||||
| -rw-r--r-- | roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm (renamed from roles/telegraf/files/telegraf-1.11.4-1.x86_64.rpm) | bin | 19830277 -> 19808751 bytes |
5 files changed, 2 insertions, 4 deletions
diff --git a/.DS_Store b/.DS_Store Binary files differnew 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/telegraf/files/telegraf-1.11.4-1.x86_64.rpm b/roles/telegraf/files/telegraf-1.13.0-1.x86_64.rpm Binary files differindex 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 |