Browse Source

allow to specify drivername for postgresql db

Change-Id: Idbac640aba8f4c87ae43df3a7019bf465895ca43
changes/68/514068/1
Benedikt Trefzer 5 years ago
parent
commit
06c9e77139
  1. 4
      manifests/db.pp
  2. 5
      releasenotes/notes/postgresql-590a36045748761a.yaml
  3. 8
      spec/defines/oslo_db_spec.rb

4
manifests/db.pp

@ -138,7 +138,7 @@ define oslo::db(
if !is_service_default($connection) {
validate_re($connection,
'^(sqlite|mysql(\+pymysql)?|postgresql|mongodb):\/\/(\S+:\S+@\S+\/\S+)?')
'^(sqlite|mysql(\+pymysql)?|postgresql(\+psycopg2)?|mongodb):\/\/(\S+:\S+@\S+\/\S+)?')
if $manage_backend_package {
case $connection {
@ -151,7 +151,7 @@ define oslo::db(
$backend_package = false
}
}
/^postgresql:\/\//: {
/^postgresql(\+psycopg2)?:\/\//: {
$backend_package = false
require '::postgresql::lib::python'
}

5
releasenotes/notes/postgresql-590a36045748761a.yaml

@ -0,0 +1,5 @@
---
features:
- allow to specify a full dbname+drivername://
protocol URL for postgresql databases.

8
spec/defines/oslo_db_spec.rb

@ -143,6 +143,14 @@ describe 'oslo::db' do
end
end
context 'with postgresql backend + drivername' do
let :params do
{ :connection => 'postgresql+psycopg2://db:db@localhost/db' }
end
it { is_expected.to contain_keystone_config('database/connection').with_value('postgresql+psycopg2://db:db@localhost/db').with_secret(true) }
end
context 'with incorrect database_connection string' do
let :params do
{ :connection => 'foo://db:db@localhost/db', }

Loading…
Cancel
Save