Commit 36a95d824337c63229c52cf53feb2a6e7260081b
1 parent
2e4b00ae
Exists in
master
and in
17 other branches
Remove erchef-related bootstrap code
Showing
1 changed file
with
0 additions
and
28 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/recipes/bootstrap.rb
| @@ -16,34 +16,6 @@ | @@ -16,34 +16,6 @@ | ||
| 16 | # | 16 | # |
| 17 | 17 | ||
| 18 | bootstrap_status_file = "/var/opt/chef-server/bootstrapped" | 18 | bootstrap_status_file = "/var/opt/chef-server/bootstrapped" |
| 19 | -erchef_dir = "/opt/chef-server/embedded/service/erchef" | ||
| 20 | - | ||
| 21 | -erchef_status_url = "http://#{node['chef_server']['erchef']['listen']}" | ||
| 22 | -erchef_status_url << ":#{node['chef_server']['erchef']['port']}/_status" | ||
| 23 | - | ||
| 24 | -execute "verify-system-status" do | ||
| 25 | - command "curl -sf #{erchef_status_url}" | ||
| 26 | - retries 20 | ||
| 27 | - not_if { File.exists?(bootstrap_status_file) } | ||
| 28 | -end | ||
| 29 | - | ||
| 30 | -execute "boostrap-chef-server" do | ||
| 31 | - command "bin/bootstrap-chef-server" | ||
| 32 | - cwd erchef_dir | ||
| 33 | - not_if { File.exists?(bootstrap_status_file) } | ||
| 34 | - environment({ 'CHEF_ADMIN_USER' => node['chef_server']['chef-server-webui']['web_ui_admin_user_name'], | ||
| 35 | - 'CHEF_ADMIN_PASS' => node['chef_server']['chef-server-webui']['web_ui_admin_default_password'] }) | ||
| 36 | - notifies :restart, 'service[erchef]' | ||
| 37 | -end | ||
| 38 | - | ||
| 39 | -# servers need access to this key. | ||
| 40 | -chef_user = node['chef_server']['user']['username'] | ||
| 41 | -file "/etc/chef-server/chef-webui.pem" do | ||
| 42 | - owner "root" | ||
| 43 | - group chef_user | ||
| 44 | - mode "0640" | ||
| 45 | - not_if { File.exists?(bootstrap_status_file) } | ||
| 46 | -end | ||
| 47 | 19 | ||
| 48 | file bootstrap_status_file do | 20 | file bootstrap_status_file do |
| 49 | owner "root" | 21 | owner "root" |