Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 1618d79

Browse files
pierresouchaymkeeler
authored andcommitted
Allow "disable_host_node_id": false to work on Linux as non-root. (hashicorp#4926)
Bump `shirou/gopsutil` to include shirou/gopsutil#603 This will allow to have consistent node-id even when machine is reinstalled when using `"disable_host_node_id": false` It will fix hashicorp#4914 and allow having the same node-id even when reinstalling a node from scratch. However, it is only compatible with a single OS (installing to Windows will change the node-id, but it seems acceptable).
1 parent 8969b8d commit 1618d79

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

vendor/github.com/shirou/gopsutil/cpu/cpu_windows.go

Lines changed: 9 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/shirou/gopsutil/host/host_linux.go

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/vendor.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,14 @@
258258
{"path":"github.com/ryanuber/columnize","checksumSHA1":"ExnVEVNT8APpFTm26cUb5T09yR4=","comment":"v2.0.1-8-g983d3a5","revision":"9b3edd62028f107d7cabb19353292afd29311a4e","revisionTime":"2016-07-12T16:32:29Z"},
259259
{"path":"github.com/ryanuber/go-glob","checksumSHA1":"6JP37UqrI0H80Gpk0Y2P+KXgn5M=","revision":"256dc444b735e061061cf46c809487313d5b0065","revisionTime":"2017-01-28T01:21:29Z"},
260260
{"path":"github.com/sean-/seed","checksumSHA1":"A/YUMbGg1LHIeK2+NLZBt+MIAao=","revision":"3c72d44db0c567f7c901f9c5da5fe68392227750","revisionTime":"2017-02-08T16:47:21Z"},
261-
{"path":"github.com/shirou/gopsutil/cpu","checksumSHA1":"xnCc/S88aNcLk5ypKy35jzFWSEA=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
262-
{"path":"github.com/shirou/gopsutil/disk","checksumSHA1":"JRyOki26wb3vORGErYK95N4tAeQ=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
263-
{"path":"github.com/shirou/gopsutil/host","checksumSHA1":"WpGujRcl7wfklBc5/8JREHAQmF4=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
264-
{"path":"github.com/shirou/gopsutil/internal/common","checksumSHA1":"GR7l7Ez4ppxIfonl7aJayYRVPWc=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
265-
{"path":"github.com/shirou/gopsutil/mem","checksumSHA1":"ehcscnqRvxDZYb1nBDVzZi8vFi8=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
266-
{"path":"github.com/shirou/gopsutil/net","checksumSHA1":"wAc1Qo6T9MTYdSog78uJfCYZPtc=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
267-
{"path":"github.com/shirou/gopsutil/process","checksumSHA1":"eI4qh+sc46gqKAfBt2jspO2l448=","revision":"a11c78ba2c13c5b1ee59c53296ba35f92f0ce658","revisionTime":"2018-09-27T12:43:08Z"},
261+
{"path":"github.com/shirou/gopsutil","checksumSHA1":"KUrV5Esg6Wdcrv+hDc6/p0Q3/qw=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
262+
{"path":"github.com/shirou/gopsutil/cpu","checksumSHA1":"ZRkivbqqxTXH267b+mFAEk55HRI=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
263+
{"path":"github.com/shirou/gopsutil/disk","checksumSHA1":"JRyOki26wb3vORGErYK95N4tAeQ=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
264+
{"path":"github.com/shirou/gopsutil/host","checksumSHA1":"j+lnhiTHzGU2/EOd2k2EceD7Mak=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
265+
{"path":"github.com/shirou/gopsutil/internal/common","checksumSHA1":"GR7l7Ez4ppxIfonl7aJayYRVPWc=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
266+
{"path":"github.com/shirou/gopsutil/mem","checksumSHA1":"ehcscnqRvxDZYb1nBDVzZi8vFi8=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
267+
{"path":"github.com/shirou/gopsutil/net","checksumSHA1":"wAc1Qo6T9MTYdSog78uJfCYZPtc=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
268+
{"path":"github.com/shirou/gopsutil/process","checksumSHA1":"eI4qh+sc46gqKAfBt2jspO2l448=","revision":"48177ef5f8809fc72b716c414435f2d4cff8e24d","revisionTime":"2018-11-07T11:16:21Z"},
268269
{"path":"github.com/shirou/w32","checksumSHA1":"Nve7SpDmjsv6+rhkXAkfg/UQx94=","revision":"bb4de0191aa41b5507caa14b0650cdbddcd9280b","revisionTime":"2016-09-30T03:27:40Z"},
269270
{"path":"github.com/spf13/pflag","checksumSHA1":"WVKhLVXQFxXwmuRX+IRzebUmxjE=","revision":"298182f68c66c05229eb03ac171abe6e309ee79a","revisionTime":"2018-08-31T15:14:32Z"},
270271
{"path":"github.com/stretchr/objx","checksumSHA1":"n+vQ7Bmp+ODWGmCp8cI5MFsaZVA=","revision":"a5cfa15c000af5f09784e5355969ba7eb66ef0de","revisionTime":"2018-04-26T10:50:06Z"},

0 commit comments

Comments
 (0)