lib/cucumber/chef/provisioner.rb in cucumber-chef-3.0.3 vs lib/cucumber/chef/provisioner.rb in cucumber-chef-3.0.4
- old
+ new
@@ -85,10 +85,11 @@
def bootstrap
raise ProvisionerError, "You must have the environment variable 'USER' set." if !Cucumber::Chef::Config.user
ZTK::Benchmark.bench(:message => "Bootstrapping #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :ui => @ui) do
+ server_name = @test_lab.ip
chef_solo_attributes = case Cucumber::Chef.chef_pre_11
when true then
{
"chef-server" => {
@@ -97,18 +98,28 @@
"run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy] role[test_lab])
}
when false then
{
"chef-server" => {
+ "api_fqdn" => server_name,
"nginx" => {
"enable_non_ssl" => true,
- "server_name" => "localhost",
- "url" => "http://localhost"
+ "server_name" => server_name,
+ "url" => "https://#{server_name}"
},
+ "lb" => {
+ "fqdn" => server_name
+ },
+ "bookshelf" => {
+ "vip" => server_name
+ },
"chef_server_webui" => {
"enable" => true
- }
+ },
+ "version" => Cucumber::Chef::Config.chef[:version],
+ "prereleases" => Cucumber::Chef::Config.chef[:prereleases],
+ "nightlies" => Cucumber::Chef::Config.chef[:nightlies]
},
"run_list" => %w(recipe[chef-server::default] role[test_lab])
}
end
@@ -120,9 +131,10 @@
"lxc_user" => Cucumber::Chef.lxc_user
}
)
context = {
+ :server_name => server_name,
:lab_user => Cucumber::Chef.lab_user,
:chef_pre_11 => Cucumber::Chef.chef_pre_11,
:chef_solo_attributes => chef_solo_attributes,
:chef_version => Cucumber::Chef::Config.chef[:version],
:chef_validator => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),