Download as
Browse Code »

Commit 7cec18d4352d1a8d2a301c591bb779a303414f3e

Authored by Jacob Vosmaer
1 parent 1feb98d2
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Bring back the bootstrap attribute

Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @7cec18d
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
  18 +default['gitlab']['bootstrap']['enable'] = true
  19 +
18 ### 20 ###
19 # PostgreSQL 21 # PostgreSQL
20 ### 22 ###
files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
  Diff comments   View file @7cec18d
@@ -24,6 +24,7 @@ require 'securerandom' @@ -24,6 +24,7 @@ require 'securerandom'
24 module GitLab 24 module GitLab
25 extend(Mixlib::Config) 25 extend(Mixlib::Config)
26 26
  27 + bootstrap Mash.new
27 postgresql Mash.new 28 postgresql Mash.new
28 node nil 29 node nil
29 30
@@ -66,6 +67,7 @@ module GitLab @@ -66,6 +67,7 @@ module GitLab
66 def generate_hash 67 def generate_hash
67 results = { "gitlab" => {} } 68 results = { "gitlab" => {} }
68 [ 69 [
  70 + "bootstrap",
69 "postgresql" 71 "postgresql"
70 ].each do |key| 72 ].each do |key|
71 rkey = key.gsub('_', '-') 73 rkey = key.gsub('_', '-')