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.

Sign up for GitHub

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

Jump to bottom

Honors accept_license for the Chef Infra Server install #159

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Honors accept_license for the Chef Infra Server install #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaf9cf7
Setting accept_license for Chef Infa Server
Jul 17, 2019
cc573fc
nil means false in Ruby terms anyway
Jul 17, 2019
5e9f4fc
accepting chef infra server license for testing
Jul 17, 2019
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
9 changes: 9 additions & 0 deletions kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,24 @@ suites:
- name: default
run_list:
- recipe[test::default]
attributes:
chef-server:
accept_license: true
- name: no-fqdn
run_list:
- recipe[test::no-fqdn]
driver:
network:
- ['private_network', {ip: '192.168.243.2'}]
attributes:
chef-server:
accept_license: true
- name: add-ons-no-fqdn
run_list:
- recipe[test::add-ons-no-fqdn]
driver:
network:
- ['private_network', {ip: '192.168.243.3'}]
attributes:
chef-server:
accept_license: true
2 changes: 1 addition & 1 deletion recipes/addons.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
node['chef-server']['addons'].each do |addon, ver|
chef_ingredient addon do
accept_license node['chef-server']['accept_license'] unless node['chef-server']['accept_license'].nil?
accept_license node['chef-server']['accept_license']
notifies :reconfigure, "chef_ingredient[#{addon}]"
version ver unless ver.nil?
end
Expand Down
1 change: 1 addition & 0 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
extend ChefServerCookbook::Helpers
version node['chef-server']['version'] unless node['chef-server']['version'].nil?
package_source node['chef-server']['package_source']
accept_license node['chef-server']['accept_license']
config <<-EOS
topology "#{node['chef-server']['topology']}"
#{"api_fqdn \"#{node['chef-server']['api_fqdn']}\"" if api_fqdn_available?}
Expand Down