Skip to content

Commit cac3ddc

Browse files
author
George Hansper
committed
add parameter "version" to postgresql::server::extension - fix dependency on database
1 parent 34aa0af commit cac3ddc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

manifests/server/extension.pp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
}
3333
}
3434

35+
if( $database != 'postgres' ) {
36+
# The database postgres cannot managed by this module, so it is exempt from this dependency
37+
Postgresql_psql {
38+
require => Postgresql::Server::Database[$database],
39+
}
40+
}
3541

3642
postgresql_psql {"Add ${extension} extension to ${database}":
3743

@@ -45,10 +51,6 @@
4551
unless => "SELECT t.count FROM (SELECT count(extname) FROM pg_extension WHERE extname = '${extension}') as t WHERE t.count ${unless_comp} 1",
4652
}
4753

48-
if($database != undef and defined(Postgresql::Server::Database[$database])) {
49-
Postgresql::Server::Database[$database]->Postgresql_psql["Add ${extension} extension to ${database}"]
50-
}
51-
5254
if $package_name {
5355
$_package_ensure = $package_ensure ? {
5456
undef => $ensure,
@@ -79,8 +81,5 @@
7981
command => $alter_extension_sql,
8082
unless => $update_unless,
8183
}
82-
if($database != undef and defined(Postgresql::Server::Database[$database])) {
83-
Postgresql::Server::Database[$database]->Postgresql_psql["${database}: ${alter_extension_sql}"]
84-
}
8584
}
8685
}

0 commit comments

Comments
 (0)