openstack/puppet-oslo
Code Issues Proposed changes

Allow setting state for backend packages

Browse Source 
A user might want the latest copy or the backend DB packages not
installed at all if installing in a venv.

Change-Id: I811bc71c604c37b3be3ca2ef7c71d54ef40a1830
This commit is contained in:
Matt Fischer
2016-10-17 08:45:16 -06:00
parent 1ddc04fc55
commit 712515a982
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
manifests/db.pp
View File

@@ -19,6 +19,11 @@
# (Optional) The back end to use for the database. # (Optional) The back end to use for the database.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*backend_package_ensure*]
# (Optional) Desired ensure state of the backend database package,
# accepts latest or specific versions.
# Defaults to present.
#
# [*connection*] # [*connection*]
# (Optional) The SQLAlchemy connection string to use to connect to the database. # (Optional) The SQLAlchemy connection string to use to connect to the database.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -96,27 +101,28 @@
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
define oslo::db( define oslo::db(
$sqlite_db = $::os_service_default, $sqlite_db = $::os_service_default,
$sqlite_synchronous = $::os_service_default, $sqlite_synchronous = $::os_service_default,
$backend = $::os_service_default, $backend = $::os_service_default,
$connection = $::os_service_default, $backend_package_ensure = present,
$slave_connection = $::os_service_default, $connection = $::os_service_default,
$mysql_sql_mode = $::os_service_default, $slave_connection = $::os_service_default,
$idle_timeout = $::os_service_default, $mysql_sql_mode = $::os_service_default,
$min_pool_size = $::os_service_default, $idle_timeout = $::os_service_default,
$max_pool_size = $::os_service_default, $min_pool_size = $::os_service_default,
$max_retries = $::os_service_default, $max_pool_size = $::os_service_default,
$retry_interval = $::os_service_default, $max_retries = $::os_service_default,
$max_overflow = $::os_service_default, $retry_interval = $::os_service_default,
$connection_debug = $::os_service_default, $max_overflow = $::os_service_default,
$connection_trace = $::os_service_default, $connection_debug = $::os_service_default,
$pool_timeout = $::os_service_default, $connection_trace = $::os_service_default,
$use_db_reconnect = $::os_service_default, $pool_timeout = $::os_service_default,
$db_retry_interval = $::os_service_default, $use_db_reconnect = $::os_service_default,
$db_inc_retry_interval = $::os_service_default, $db_retry_interval = $::os_service_default,
$db_max_retry_interval = $::os_service_default, $db_inc_retry_interval = $::os_service_default,
$db_max_retries = $::os_service_default, $db_max_retry_interval = $::os_service_default,
$use_tpool = $::os_service_default, $db_max_retries = $::os_service_default,
$use_tpool = $::os_service_default,
){ ){
include ::oslo::params include ::oslo::params
@@ -153,7 +159,7 @@ define oslo::db(
if $backend_package and !defined(Package[$backend_package]) { if $backend_package and !defined(Package[$backend_package]) {
package { 'db_backend_package': package { 'db_backend_package':
ensure => present, ensure => $backend_package_ensure,
name => $backend_package, name => $backend_package,
tag => 'openstack', tag => 'openstack',
} }

6
releasenotes/notes/backend_package_ensure-54b4525895ce9acd.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- Allow setting the desired state of the backend
database package. This will default to present
which maintains original behavior but allows
for more flexibility.