feat: make etcd_bin_prefix customizable
#1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EtienneM
changed the title
etcd_bin_prefix customizable
EtienneM
force-pushed
the
fix/kitchen/1633/different_etcd_versions
branch
from
d7b933e
to
ca37a55
Compare
EtienneM
force-pushed
the
fix/kitchen/1633/different_etcd_versions
branch
from
ca37a55
to
3a2a64a
Compare
EtienneM
commented
Mar 1, 2023
| @@ -16,8 +16,9 @@ def self.included(base) | |||
| ##################### | |||
| # set default service name like etcd.service | |||
| property :default_service_name, kind_of: [TrueClass, FalseClass], default: false | |||
| property :etcd_bin_prefix, String, default: '/usr/local/bin', desired_state: false | |||
There was a problem hiding this comment.
Default used to be /usr/bin. But from what I understand that is not what /usr/bin is for (https://unix.stackexchange.com/a/259238). /usr/local/bin seems more appropriate.
Comment on lines
+37
to
+40
| file 'etcd_checksum' do | ||
| path "#{new_resource.etcd_bin_prefix}/.etcd_checksum" | ||
| content new_resource.checksum | ||
| end |
There was a problem hiding this comment.
We need to store the checksum in a file so that we trigger the extraction of etcd and etcdctl when the checksum (hence the etcd version) changes.
Comment on lines
-79
to
-93
| def etcd_bin | ||
| "#{etcd_bin_prefix}/etcd" | ||
| end | ||
|
|
||
| def etcd_bin_prefix | ||
| '/usr/bin' | ||
| end | ||
|
|
||
| def etcdctl_bin | ||
| "#{etcdctl_bin_prefix}/etcdctl" | ||
| end | ||
|
|
||
| def etcdctl_bin_prefix | ||
| etcd_bin_prefix | ||
| end |
There was a problem hiding this comment.
These are now only declared in a single place, libraries/helpers_service.rb, rather than duplicated.
This was referenced Mar 1, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to sous-chefs#139
I tested it in staging. PR on the kitchen incoming.