Skip to content

Commit 1d28765

Browse files
committed
Fixes #34640 - Drop apipie:cache:index
Apipie cache has been explicitly disabled in Foreman so don't waste time generating an index.
1 parent 1b5eec2 commit 1d28765

File tree

5 files changed

+3
-9
lines changed

5 files changed

+3
-9
lines changed

manifests/database.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
foreman::rake { 'db:migrate':
2828
timeout => $timeout,
2929
unless => '/usr/sbin/foreman-rake db:abort_if_pending_migrations',
30-
notify => Foreman::Rake['apipie:cache:index', 'apipie_dsl:cache', 'db:seed'],
30+
notify => Foreman::Rake['apipie_dsl:cache', 'db:seed'],
3131
}
3232
~> foreman_config_entry { 'db_pending_seed':
3333
value => false,
3434
dry => true,
3535
}
3636
~> foreman::rake { 'db:seed':
3737
environment => delete_undef_values($seed_env),
38-
notify => Foreman::Rake['apipie:cache:index', 'apipie_dsl:cache'],
38+
notify => Foreman::Rake['apipie_dsl:cache'],
3939
}
4040
}
4141
}

manifests/init.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@
300300
$db_sslmode_real = $db_sslmode
301301
}
302302

303-
foreman::rake { 'apipie:cache:index':
304-
timeout => 0,
305-
}
306-
307303
foreman::rake { 'apipie_dsl:cache':
308304
timeout => 0,
309305
}

manifests/plugin.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
package { $real_package:
4242
ensure => $version,
4343
}
44-
~> Foreman::Rake['apipie:cache:index', 'apipie_dsl:cache']
44+
~> Foreman::Rake['apipie_dsl:cache']
4545

4646
if $config {
4747
file { $config_file:

spec/classes/foreman_database_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
it { should contain_foreman__rake('db:migrate') }
1515
it { should contain_foreman_config_entry('db_pending_seed') }
1616
it { should contain_foreman__rake('db:seed') }
17-
it { should contain_foreman__rake('apipie:cache:index') }
1817
it { should contain_foreman__rake('apipie_dsl:cache') }
1918
end
2019

spec/classes/foreman_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
it { should contain_foreman__rake('db:migrate') }
126126
it { should contain_foreman_config_entry('db_pending_seed') }
127127
it { should contain_foreman__rake('db:seed') }
128-
it { should contain_foreman__rake('apipie:cache:index') }
129128
it { should contain_foreman__rake('apipie_dsl:cache') }
130129

131130
# jobs

0 commit comments

Comments
 (0)