From 712515a982626777a46d4430a6d1610b01afe554 Mon Sep 17 00:00:00 2001
From: Matt Fischer <matt@mattfischer.com>
Date: Mon, 17 Oct 2016 08:45:16 -0600
Subject: [PATCH] Allow setting state for backend packages

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

Change-Id: I811bc71c604c37b3be3ca2ef7c71d54ef40a1830
---
 manifests/db.pp                               | 50 +++++++++++--------
 ...ckend_package_ensure-54b4525895ce9acd.yaml |  6 +++
 2 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 releasenotes/notes/backend_package_ensure-54b4525895ce9acd.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 1652513..0e38026 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -19,6 +19,11 @@
 #   (Optional) The back end to use for the database.
 #   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*]
 #   (Optional) The SQLAlchemy connection string to use to connect to the database.
 #   Defaults to $::os_service_default
@@ -96,27 +101,28 @@
 #   Defaults to $::os_service_default
 #
 define oslo::db(
-  $sqlite_db             = $::os_service_default,
-  $sqlite_synchronous    = $::os_service_default,
-  $backend               = $::os_service_default,
-  $connection            = $::os_service_default,
-  $slave_connection      = $::os_service_default,
-  $mysql_sql_mode        = $::os_service_default,
-  $idle_timeout          = $::os_service_default,
-  $min_pool_size         = $::os_service_default,
-  $max_pool_size         = $::os_service_default,
-  $max_retries           = $::os_service_default,
-  $retry_interval        = $::os_service_default,
-  $max_overflow          = $::os_service_default,
-  $connection_debug      = $::os_service_default,
-  $connection_trace      = $::os_service_default,
-  $pool_timeout          = $::os_service_default,
-  $use_db_reconnect      = $::os_service_default,
-  $db_retry_interval     = $::os_service_default,
-  $db_inc_retry_interval = $::os_service_default,
-  $db_max_retry_interval = $::os_service_default,
-  $db_max_retries        = $::os_service_default,
-  $use_tpool             = $::os_service_default,
+  $sqlite_db              = $::os_service_default,
+  $sqlite_synchronous     = $::os_service_default,
+  $backend                = $::os_service_default,
+  $backend_package_ensure = present,
+  $connection             = $::os_service_default,
+  $slave_connection       = $::os_service_default,
+  $mysql_sql_mode         = $::os_service_default,
+  $idle_timeout           = $::os_service_default,
+  $min_pool_size          = $::os_service_default,
+  $max_pool_size          = $::os_service_default,
+  $max_retries            = $::os_service_default,
+  $retry_interval         = $::os_service_default,
+  $max_overflow           = $::os_service_default,
+  $connection_debug       = $::os_service_default,
+  $connection_trace       = $::os_service_default,
+  $pool_timeout           = $::os_service_default,
+  $use_db_reconnect       = $::os_service_default,
+  $db_retry_interval      = $::os_service_default,
+  $db_inc_retry_interval  = $::os_service_default,
+  $db_max_retry_interval  = $::os_service_default,
+  $db_max_retries         = $::os_service_default,
+  $use_tpool              = $::os_service_default,
 ){
 
   include ::oslo::params
@@ -153,7 +159,7 @@ define oslo::db(
 
     if $backend_package and !defined(Package[$backend_package]) {
       package { 'db_backend_package':
-        ensure => present,
+        ensure => $backend_package_ensure,
         name   => $backend_package,
         tag    => 'openstack',
       }
diff --git a/releasenotes/notes/backend_package_ensure-54b4525895ce9acd.yaml b/releasenotes/notes/backend_package_ensure-54b4525895ce9acd.yaml
new file mode 100644
index 0000000..0809b17
--- /dev/null
+++ b/releasenotes/notes/backend_package_ensure-54b4525895ce9acd.yaml
@@ -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.