Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding peer-cert-allowed-cn new option in allowed resources properties #94

Merged
merged 1 commit into from
Jan 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ The `etcd_service` resource property list corresponds to the options found in
- `peer_key_file`
- `peer_client_cert_auth`
- `peer_trusted_ca_file`
- `peer_cert_allowed_cn`
- `peer_auto_tls`
- `etcdctl_client_cert_file`
- `etcdctl_client_key_file`
Expand Down
1 change: 1 addition & 0 deletions libraries/etcd_common_properties.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def self.included(base)
property :client_cert_auth, [true, false], default: false, desired_state: false
property :trusted_ca_file, String, desired_state: false
property :auto_tls, [true, false], default: false, desired_state: false
property :peer_cert_allowed_cn, String, desired_state: false
property :peer_cert_file, String, desired_state: false
property :peer_key_file, String, desired_state: false
property :peer_client_cert_auth, [true, false], default: false, desired_state: false
Expand Down
1 change: 1 addition & 0 deletions libraries/helpers_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def etcd_daemon_opts
opts << "-listen-peer-urls=#{new_resource.listen_peer_urls}" unless new_resource.listen_peer_urls.nil?
opts << "-max-snapshots=#{new_resource.max_snapshots}" unless new_resource.max_snapshots.nil?
opts << "-max-wals=#{new_resource.max_wals}" unless new_resource.max_wals.nil?
opts << "-peer-cert-allowed-cn=#{new_resource.peer_cert_allowed_cn}" unless new_resource.peer_cert_allowed_cn?
opts << "-peer-cert-file=#{new_resource.peer_cert_file}" unless new_resource.peer_cert_file.nil?
opts << '-peer-client-cert-auth=true' if new_resource.peer_client_cert_auth == true
opts << "-peer-key-file=#{new_resource.peer_key_file}" unless new_resource.peer_key_file.nil?
Expand Down