Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Current modules[1][2][3] implements a <component>::db class that is not implemented in neutron. This commit aims to apply here the same logic. [1] https://github.com/openstack/puppet-nova/blob/master/manifests/db.pp [2] https://github.com/openstack/puppet-designate/blob/master/manifests/db.pp [3] https://github.com/openstack/puppet-ceilometer/blob/master/manifests/db.pp Change-Id: I4169145d9a75bcbf607ace426dca671e0eec0261
- Loading branch information
Showing
5 changed files
with
177 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # == Class: neutron::db | ||
| # | ||
| # Configure the Neutron database | ||
| # | ||
| # === Parameters | ||
| # | ||
| # [*database_connection*] | ||
| # Url used to connect to database. | ||
| # (Optional) Defaults to 'sqlite:////var/lib/neutron/ovs.sqlite'. | ||
| # | ||
| # [*database_idle_timeout*] | ||
| # Timeout when db connections should be reaped. | ||
| # (Optional) Defaults to 3600. | ||
| # | ||
| # [*database_min_pool_size*] | ||
| # Minimum number of SQL connections to keep open in a pool. | ||
| # (Optional) Defaults to 1. | ||
| # | ||
| # [*database_max_pool_size*] | ||
| # Maximum number of SQL connections to keep open in a pool. | ||
| # (Optional) Defaults to 10. | ||
| # | ||
| # [*database_max_retries*] | ||
| # Maximum db connection retries during startup. | ||
| # Setting -1 implies an infinite retry count. | ||
| # (Optional) Defaults to 10. | ||
| # | ||
| # [*database_retry_interval*] | ||
| # Interval between retries of opening a sql connection. | ||
| # (Optional) Defaults to 10. | ||
| # | ||
| # [*database_max_overflow*] | ||
| # If set, use this value for max_overflow with sqlalchemy. | ||
| # (Optional) Defaults to 20. | ||
| # | ||
| class neutron::db ( | ||
| $database_connection = 'sqlite:////var/lib/neutron/ovs.sqlite', | ||
| $database_idle_timeout = 3600, | ||
| $database_min_pool_size = 1, | ||
| $database_max_pool_size = 10, | ||
| $database_max_retries = 10, | ||
| $database_retry_interval = 10, | ||
| $database_max_overflow = 20, | ||
| ) { | ||
|
|
||
| # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function | ||
| # to use neutron::<myparam> if neutron::db::<myparam> isn't specified. | ||
| $database_connection_real = pick($::neutron::server::database_connection, $database_connection) | ||
| $database_idle_timeout_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout) | ||
| $database_min_pool_size_real = pick($::neutron::server::database_min_pool_size, $database_min_pool_size) | ||
| $database_max_pool_size_real = pick($::neutron::server::database_max_pool_size, $database_max_pool_size) | ||
| $database_max_retries_real = pick($::neutron::server::database_max_retries, $database_max_retries) | ||
| $database_retry_interval_real = pick($::neutron::server::database_retry_interval, $database_retry_interval) | ||
| $database_max_overflow_real = pick($::neutron::server::database_max_overflow, $database_max_overflow) | ||
|
|
||
| validate_re($database_connection_real, | ||
| '(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') | ||
|
|
||
| if $database_connection_real { | ||
| case $database_connection_real { | ||
| /^mysql:\/\//: { | ||
| $backend_package = false | ||
| require 'mysql::bindings' | ||
| require 'mysql::bindings::python' | ||
| } | ||
| /^postgresql:\/\//: { | ||
| $backend_package = $::neutron::params::psycopg_package_name | ||
| } | ||
| /^sqlite:\/\//: { | ||
| $backend_package = $::neutron::params::sqlite_package_name | ||
| } | ||
| default: { | ||
| fail('Unsupported backend configured') | ||
| } | ||
| } | ||
|
|
||
| if $backend_package and !defined(Package[$backend_package]) { | ||
| package {'neutron-backend-package': | ||
| ensure => present, | ||
| name => $backend_package, | ||
| tag => 'openstack', | ||
| } | ||
| } | ||
|
|
||
| neutron_config { | ||
| 'database/connection': value => $database_connection_real, secret => true; | ||
| 'database/idle_timeout': value => $database_idle_timeout_real; | ||
| 'database/min_pool_size': value => $database_min_pool_size_real; | ||
| 'database/max_retries': value => $database_max_retries_real; | ||
| 'database/retry_interval': value => $database_retry_interval_real; | ||
| 'database/max_pool_size': value => $database_max_pool_size_real; | ||
| 'database/max_overflow': value => $database_max_overflow_real; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| require 'spec_helper' | ||
|
|
||
| describe 'neutron::db' do | ||
|
|
||
| shared_examples 'neutron::db' do | ||
|
|
||
| context 'with default parameters' do | ||
|
|
||
| it { is_expected.to contain_neutron_config('database/connection').with_value('sqlite:////var/lib/neutron/ovs.sqlite').with_secret(true) } | ||
| it { is_expected.to contain_neutron_config('database/idle_timeout').with_value('3600') } | ||
| it { is_expected.to contain_neutron_config('database/min_pool_size').with_value('1') } | ||
| it { is_expected.to contain_neutron_config('database/max_retries').with_value('10') } | ||
| it { is_expected.to contain_neutron_config('database/retry_interval').with_value('10') } | ||
|
|
||
| end | ||
|
|
||
| context 'with specific parameters' do | ||
| let :params do | ||
| { :database_connection => 'mysql://neutron:neutron@localhost/neutron', | ||
| :database_idle_timeout => '3601', | ||
| :database_min_pool_size => '2', | ||
| :database_max_retries => '11', | ||
| :database_retry_interval => '11', } | ||
| end | ||
|
|
||
| it { is_expected.to contain_neutron_config('database/connection').with_value('mysql://neutron:neutron@localhost/neutron').with_secret(true) } | ||
| it { is_expected.to contain_neutron_config('database/idle_timeout').with_value('3601') } | ||
| it { is_expected.to contain_neutron_config('database/min_pool_size').with_value('2') } | ||
| it { is_expected.to contain_neutron_config('database/max_retries').with_value('11') } | ||
| it { is_expected.to contain_neutron_config('database/retry_interval').with_value('11') } | ||
|
|
||
| end | ||
|
|
||
| context 'with incorrect database_connection string' do | ||
| let :params do | ||
| { :database_connection => 'redis://neutron:neutron@localhost/neutron', } | ||
| end | ||
|
|
||
| it_raises 'a Puppet::Error', /validate_re/ | ||
| end | ||
|
|
||
| end | ||
|
|
||
| context 'on Debian platforms' do | ||
| let :facts do | ||
| { :osfamily => 'Debian' } | ||
| end | ||
|
|
||
| it_configures 'neutron::db' | ||
| end | ||
|
|
||
| context 'on Redhat platforms' do | ||
| let :facts do | ||
| { :osfamily => 'RedHat' } | ||
| end | ||
|
|
||
| it_configures 'neutron::db' | ||
| end | ||
|
|
||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters