Skip to content

add parameter "version" to postgresql::server::extension - fix dependency on database #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2017
Merged

add parameter "version" to postgresql::server::extension - fix dependency on database #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac3ddc
add parameter "version" to postgresql::server::extension - fix depend…
Oct 27, 2017
bccc11a
(SERVER-2003) stub major versions
eputnam Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions manifests/server/extension.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
}
}

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

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

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

if($database != undef and defined(Postgresql::Server::Database[$database])) {
Postgresql::Server::Database[$database]->Postgresql_psql["Add ${extension} extension to ${database}"]
}

if $package_name {
$_package_ensure = $package_ensure ? {
undef => $ensure,
Expand Down Expand Up @@ -79,8 +81,5 @@
command => $alter_extension_sql,
unless => $update_unless,
}
if($database != undef and defined(Postgresql::Server::Database[$database])) {
Postgresql::Server::Database[$database]->Postgresql_psql["${database}: ${alter_extension_sql}"]
}
}
}
3 changes: 2 additions & 1 deletion spec/unit/classes/globals_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
:family => 'Debian',
:name => 'Debian',
:release => {
:full => '6.0'
:full => '6.0',
:major => '6'
}
},
:osfamily => 'Debian',
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/classes/repo_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
:name => 'Debian',
:family => 'Debian',
:release => {
:full => '6.0'
:full => '6.0',
:major => '6'
}
},
:osfamily => 'Debian',
Expand Down
3 changes: 2 additions & 1 deletion spec/unit/classes/server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
:family => 'Debian',
:name => 'Debian',
:release => {
:full => '6.0'
:full => '6.0',
:major => '6'
}
},
:osfamily => 'Debian',
Expand Down