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

Updated URL for chef #195

Merged
merged 1 commit into from
May 31, 2018
Merged

Updated URL for chef #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/puppet_agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class PuppetAgent < Base

default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'

default_config :puppet_agent_command, nil

Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/provisioner/puppet_apply.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class PuppetApply < Base
end
default_config :puppet_apt_repo, 'http://apt.puppetlabs.com/puppetlabs-release-precise.deb'
default_config :puppet_yum_repo, 'https://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm'
default_config :chef_bootstrap_url, 'https://www.getchef.com/chef/install.sh'
default_config :chef_bootstrap_url, 'https://www.chef.io/chef/install.sh'
default_config :puppet_logdest, nil
default_config :custom_install_command, nil
default_config :custom_pre_install_command, nil
Expand Down
4 changes: 2 additions & 2 deletions provisioner_options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ It installs it in the following order:

key | default value | Notes
----|---------------|--------
chef_bootstrap_url | https://www.getchef.com/ chef/install.sh | the chef (needed for busser to run tests) NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
chef_bootstrap_url | https://www.chef.io/ chef/install.sh | the chef (needed for busser to run tests) NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
custom_options | | custom options to add to puppet apply command.
custom_pre_install_command | nil | Custom shell command to be used at beginning of install stage. Can be multiline.
Expand Down Expand Up @@ -232,7 +232,7 @@ puppet_noop| false| puppet runs in a no-op or dry-run mode
update_package_repos| true| update OS repository metadata
custom_facts| Hash.new | Hash to set the puppet facts before running puppet apply
facterlib | nil | Path for dynamic fact generation, e.g. /etc/puppet/facter . See https://docs.puppetlabs.com/facter/2.2/custom_facts.html
chef_bootstrap_url |"https://www.getchef.com/chef/install.sh"| the chef (needed for busser to run tests)
chef_bootstrap_url |"https://www.chef.io/chef/install.sh"| the chef (needed for busser to run tests)
puppet_agent_command | nil | Overwrite the puppet agent command. Needs "sudo -E puppet agent" as a prefix.
require_chef_for_busser | true | Install chef as currently needed by busser to run tests. NOTE: kitchen 1.4 only requires ruby to run busser so this is not required.
puppet_config_path | | path of custom puppet.conf file
Expand Down
2 changes: 1 addition & 1 deletion spec/kitchen/provisioner/puppet_agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
end

it 'Should set correct chef bootstrap url' do
expect(provisioner[:chef_bootstrap_url]).to eq('https://www.getchef.com/chef/install.sh')
expect(provisioner[:chef_bootstrap_url]).to eq('https://www.chef.io/chef/install.sh')
end

it 'Should set nil puppet log destination' do
Expand Down
2 changes: 1 addition & 1 deletion spec/kitchen/provisioner/puppet_apply_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
end

it 'Should set correct chef bootstrap url' do
expect(provisioner[:chef_bootstrap_url]).to eq('https://www.getchef.com/chef/install.sh')
expect(provisioner[:chef_bootstrap_url]).to eq('https://www.chef.io/chef/install.sh')
end

it 'Should set nil puppet log destination' do
Expand Down