-
Notifications
You must be signed in to change notification settings - Fork 613
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.
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
postgis support #280
postgis support #280
Conversation
|
Can one of the admins verify this patch? |
|
test this please |
|
Test FAILed. |
|
retest this please |
|
Test FAILed. |
|
@kitchen ^^ looks like a valid enough failure. |
|
I didn't add and sort of testing for postfix anyways, I'll have a look at it. -Jeremy Insert PGP signature here.
|
|
Looks like it's just that there aren't package names and versions and such for postgis for non-ubuntu. I kinda expected that, actually :) I'll try setting up some vagrant boxes and get these figured out soon! |
|
For your ref: http://pkgs.org/search/?keyword=postgis You're going to need to be careful here actually. The problem I foresee is that the version of PostgreSQL may not entirely relate to the version of Postgis ... at least my gut tells me there is going to be problems with this part of the code :-). Anyway use that link ^^ as a ref for what the distros use. My other wonder - does upstream package postgis? (ie. apt|yum.postgresql.org) ... if that is the case manage_package_repo may create a different effect. Something to be careful about - and probably worth testing. |
|
yea, I actually already have support for that in the module, there's a separate postgis_version. pg 8.4 and 9.0 only have postgis 2.0, 9.1 and 9.2 both have 2.0 and 2.1, 9.3 only has 2.1. So I set the default based on that. Ubuntu, at least, does provide postgis in its own repos and the package naming pattern is the same? I dunno, pretty sure I handled that in the module :) I'll poke around at it this weekend probably and get support for all the other OSes the module supports, or at least as much as I can! |
|
Upstream provides yum repositories apt repositories. On EL the package name is |
|
this should be ready to roll now! |
|
I would squash down a couple of those commits for a cleaner history. |
|
@kitchen could you please squash down the commits to move on this PR ? |
|
squashed! |
|
@igalic what prevent this PR to be merged ? |
|
@mcanevet someone to press the merge button, I presume. |
|
I think it's been reviewed and commented on and fixed and everything, it's essentially ready for merge, except, it needs a rebase: % git add upstream git@github.com/puppetlabs:puppetlabs-postgresql
% git remote update
% git rebase upstreamm/master |
|
@kitchen could you please rebase ? |
|
@kitchen do you want me to take over the development of this feature and submit my own PR ? |
|
Oh, I thought it was good to go a while back. What's lacking? -Jeremy Insert PGP signature here.
|
|
@kitchen a rebase, for one. |
|
oops, I didn't see @mcanevet's request to rebase. I'll do that here in a bit, sorry! |
|
rebased! |
|
\o/ @apenney merge plz ;) |
|
I would love to merge this but we just have one thing to do - convert the spec/system to spec/acceptance test. If you can do that (it's very similar, just a few changes to using apply_manifest() instead, I can merge this. |
|
done, thanks @saimonn |
|
@kitchen can you please rebase that again? |
rhel support added by @mcanevet, but the branch has been squashed. thanks!
|
done |
|
@apenney can you merge it now please ? |
|
we need an @apenney clone. |
|
robo-apenney saves the day. |
|
yay! thanks! |
|
After this patch was merged into master, the beaker tests now fail for me .. is this happening for anyone else? gemedet:~ bma$ cat pre-postgis-test.txt Finished in 34 minutes 48 seconds Failures:
Finished in 31 minutes 44 seconds Failed examples: rspec ./spec/acceptance/postgis_spec.rb:19 # postgresql::server::postgis: test loading class with no parameters |
|
I'm getting two failures, Destroying vagrant boxes
[centos-64-x64] Forcing shutdown of VM...
[centos-64-x64] Destroying VM and associated drives...
Failures:
1) postgresql::server::postgis: test loading class with no parameters
Failure/Error: apply_manifest(pp, :catch_failures => true)
Beaker::Host::CommandFailure:
Host 'centos-64-x64' exited with 6 running:
env PATH="/usr/bin:/opt/puppet-git-repos/hiera/bin:${PATH}" RUBYLIB="/opt/puppet-git-repos/hiera/lib:/opt/puppet-git-repos/hiera-puppet/lib:${RUBYLIB}" puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest.pp.KqjN22
Last 10 lines of output were:
Error: /Stage[main]/Postgresql::Server::Service/Postgresql::Validate_db_connection[validate_service_is_running]/Exec[validate postgres connection for /postgres]: Failed to call refresh: echo 'Unable to connect to defined database using: /usr/bin/psql --tuples-only --quiet --dbname postgres ' && false returned 1 instead of one of [0]
Error: /Stage[main]/Postgresql::Server::Service/Postgresql::Validate_db_connection[validate_service_is_running]/Exec[validate postgres connection for /postgres]: echo 'Unable to connect to defined database using: /usr/bin/psql --tuples-only --quiet --dbname postgres ' && false returned 1 instead of one of [0]
Notice: /Stage[main]/Postgresql::Server::Service/Anchor[postgresql::server::service::end]: Dependency Package[postgresql-postgis] has failures: true
Warning: /Stage[main]/Postgresql::Server::Service/Anchor[postgresql::server::service::end]: Skipping because of failed dependencies
Notice: /Stage[main]/Postgresql::Server::Service/Anchor[postgresql::server::service::end]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Postgresql::Server::Postgis/Anchor[postgresql::server::postgis::end]: Dependency Package[postgresql-postgis] has failures: true
Warning: /Stage[main]/Postgresql::Server::Postgis/Anchor[postgresql::server::postgis::end]: Skipping because of failed dependencies
Notice: /Stage[main]/Postgresql::Server/Anchor[postgresql::server::end]: Dependency Package[postgresql-postgis] has failures: true
Warning: /Stage[main]/Postgresql::Server/Anchor[postgresql::server::end]: Skipping because of failed dependencies
Notice: Finished catalog run in 76.98 seconds
# ./spec/acceptance/postgis_spec.rb:25:in `block (2 levels) in <top (required)>'
2) postgresql::server::config_entry: should correctly set a quotes-required string
Failure/Error: apply_manifest(pp, :catch_failures => true)
Beaker::Host::CommandFailure:
Host 'centos-64-x64' exited with 1 running:
env PATH="/usr/bin:/opt/puppet-git-repos/hiera/bin:${PATH}" RUBYLIB="/opt/puppet-git-repos/hiera/lib:/opt/puppet-git-repos/hiera-puppet/lib:${RUBYLIB}" puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest.pp.iXNr7T
Last 10 lines of output were:
Info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
Info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
Info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/root_home.rb
Info: Loading facts in /etc/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
Info: Loading facts in /etc/puppet/modules/firewall/lib/facter/ip6tables_version.rb
Info: Loading facts in /etc/puppet/modules/firewall/lib/facter/iptables_version.rb
Info: Loading facts in /etc/puppet/modules/concat/lib/facter/concat_basedir.rb
Warning: Config file /etc/puppet/hiera.yaml not found, using Hiera defaults
Error: Duplicate declaration: Postgresql::Server::Config_entry[listen_addresses] is already declared in file /etc/puppet/modules/postgresql/manifests/server/config.pp:99; cannot redeclare at /tmp/apply_manifest.pp.iXNr7T:5 on node centos-64-x64.chello.at
Error: Duplicate declaration: Postgresql::Server::Config_entry[listen_addresses] is already declared in file /etc/puppet/modules/postgresql/manifests/server/config.pp:99; cannot redeclare at /tmp/apply_manifest.pp.iXNr7T:5 on node centos-64-x64.chello.at
# ./spec/acceptance/server/config_entry_spec.rb:36:in `block (2 levels) in <top (required)>'
Finished in 64 minutes 12 seconds
43 examples, 2 failures
Failed examples:
rspec ./spec/acceptance/postgis_spec.rb:19 # postgresql::server::postgis: test loading class with no parameters
rspec ./spec/acceptance/server/config_entry_spec.rb:27 # postgresql::server::config_entry: should correctly set a quotes-required string |
postgis support
there's still a decent amount of work to be done on this:
If someone wants to help me finish this for other OSes that would be great, or just let me know if I should do that and add some more commits or what.
Thanks!