3 Commits

Author SHA1 Message Date
Michael Polenchuk
bad1c6514a Update os_database_connection with extra param
Add support for providing additional parameters to be used when
constructing the database uri. This change adds an 'extra' parameter
which is a hash that will be joined together when constructing the
database uri. It should be noted that the charset option, which can be
provided as a standalone option, will override charset when passed in
the 'extra' parameter. This is to maintain backwards compatibility.

Usage Example:
  os_database_connection({
    ...
    extra => { 'charset' => 'utf-8', 'read_timeout' => 60 }
  })

Change-Id: I7ef078b76ac6cd7bea42a0ac92b383cefd47167a
Co-Authored-By: Alex Schultz <aschultz@mirantis.com>
2015-12-28 15:05:33 -07:00
Gael Chamoulaud
3fa6399cad spec: updates for rspec-puppet 2.x and rspec 3.x
This patch aim to update our specs test in order to work with the rspec-puppet
release 2.0.0, in the mean time, we update rspec syntax order to be prepared
for rspec 3.x move.

In details:
* Upgrade and pin rspec-puppet from 1.0.1 to 2.0.0
* Convert 'should' keyword to 'is_expected.to' (prepare rspec 3.x)
* Fix spec tests for rspec-puppet 2.0.0
* Clean Gemfile (remove over-specificication of runtime deps of
  puppetlabs_spec_helper)

Change-Id: Ice356e35a65204a62e47f49dd4f5816208a6dace
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-03-31 12:13:33 +02:00
Mathieu Gagné
0536a214f4 Add os_database_connection function
The os_database_connection function is an helper used to build
database connection URI from various parameters.

Example:

  os_database_connection({
    dialect  => 'mysql',
    host     => '127.0.0.1',
    port     => '3306',
    username => 'guest',
    password => 's3cr3t',
    database => 'test',
    charset  => 'utf-8'
  })

Result:

  mysql://guest:s3cr3t@127.0.0.1:3306/test?charset=utf-8

Change-Id: Id0bde33891112e36f13d3f8fdf0ff89820c09c01
2014-07-09 14:20:34 -04:00