Commit e81bbf1eb8ce01c8d1b704a630b16cc8c0f202aa
1 parent
7cec18d4
Exists in
master
and in
17 other branches
Do not try to migrate the database yet
Showing
1 changed file
with
1 additions
and
8 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
| @@ -145,14 +145,7 @@ execute "create #{db_name} database" do | @@ -145,14 +145,7 @@ execute "create #{db_name} database" do | ||
| 145 | user pg_user | 145 | user pg_user |
| 146 | not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } | 146 | not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } |
| 147 | retries 30 | 147 | retries 30 |
| 148 | - notifies :run, "execute[migrate_database]", :immediately | ||
| 149 | -end | ||
| 150 | - | ||
| 151 | -execute "migrate_database" do | ||
| 152 | - command "#{bin_dir}/psql #{db_name} --port #{pg_port} < priv/pgsql_schema.sql" | ||
| 153 | - cwd chef_db_dir | ||
| 154 | - user pg_user | ||
| 155 | - action :nothing | 148 | + # notifies :run, "execute[migrate_database]", :immediately |
| 156 | end | 149 | end |
| 157 | 150 | ||
| 158 | sql_user = node['gitlab']['postgresql']['sql_user'] | 151 | sql_user = node['gitlab']['postgresql']['sql_user'] |