Commit b5e0182d0aa07ec2bc0228d787bd7f73d206730a

Authored by Jacob Vosmaer
1 parent 36ab7d2b

Make sure db:schema:load goes before db:migrate

files/gitlab-cookbooks/gitlab/recipes/default.rb
... ... @@ -60,8 +60,8 @@ include_recipe "runit"
60 60  
61 61 # Configure Services
62 62 [
63   - "postgresql",
64 63 "redis",
  64 + "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu`
65 65 "unicorn",
66 66 "bootstrap",
67 67 ].each do |service|
... ...
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
... ... @@ -153,5 +153,5 @@ execute "create #{db_name} database" do
153 153 user pg_user
154 154 not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) }
155 155 retries 30
156   - notifies :run, "execute[initialize database]"
  156 + notifies :run, "execute[initialize database]", :immediately
157 157 end
... ...