From 5f1e4811109e44a19503327a63ad0bce7fa0cbec Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 26 Aug 2020 10:45:35 +0800
Subject: [PATCH] Add mysql_enable_ndb option

Add mysql_enable_ndb parameter to select mysql storage engine.

Change-Id: I4af38e4aa5f9a95e4b8d2542a3e4dff7d0aa21fa
Closes-Bug: #1892952
---
 manifests/db.pp                                            | 7 +++++++
 .../add_mysql_enable_ndb-option-8b82c371ad16245a.yaml      | 4 ++++
 spec/defines/oslo_db_spec.rb                               | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 289016e..4daf694 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -102,6 +102,11 @@
 #   (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
 #   Defaults to $::os_service_default
 #
+# [*mysql_enable_ndb*]
+#   (Optional) If True, transparently enables support for handling MySQL
+#   Cluster (NDB).
+#   Defaults to $::os_service_default
+#
 # DEPRECATED PARAMETERS
 #
 # [*idle_timeout*]
@@ -135,6 +140,7 @@ define oslo::db(
   $db_max_retry_interval   = $::os_service_default,
   $db_max_retries          = $::os_service_default,
   $use_tpool               = $::os_service_default,
+  $mysql_enable_ndb        = $::os_service_default,
   # DEPRCATED PARAMETERS
   $idle_timeout            = $::os_service_default,
   $min_pool_size           = undef,
@@ -211,6 +217,7 @@ define oslo::db(
     "${config_group}/db_max_retry_interval"   => { value => $db_max_retry_interval },
     "${config_group}/db_max_retries"          => { value => $db_max_retries },
     "${config_group}/use_tpool"               => { value => $use_tpool },
+    "${config_group}/mysql_enable_ndb"        => { value => $mysql_enable_ndb },
   }
 
   create_resources($name, $database_options)
diff --git a/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml b/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml
new file mode 100644
index 0000000..2e28c5c
--- /dev/null
+++ b/releasenotes/notes/add_mysql_enable_ndb-option-8b82c371ad16245a.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add mysql_enable_ndb parameter to select mysql storage engine.
diff --git a/spec/defines/oslo_db_spec.rb b/spec/defines/oslo_db_spec.rb
index dab20d9..1a827b4 100644
--- a/spec/defines/oslo_db_spec.rb
+++ b/spec/defines/oslo_db_spec.rb
@@ -27,6 +27,7 @@ describe 'oslo::db' do
         is_expected.to contain_keystone_config('database/db_max_retry_interval').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('database/db_max_retries').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_keystone_config('database/use_tpool').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('database/mysql_enable_ndb').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -51,6 +52,7 @@ describe 'oslo::db' do
           :db_max_retry_interval   => '10',
           :db_max_retries          => '20',
           :use_tpool               => true,
+          :mysql_enable_ndb        => true,
         }
       end
 
@@ -72,6 +74,7 @@ describe 'oslo::db' do
         is_expected.to contain_keystone_config('custom_group/db_max_retry_interval').with_value('10')
         is_expected.to contain_keystone_config('custom_group/db_max_retries').with_value('20')
         is_expected.to contain_keystone_config('custom_group/use_tpool').with_value(true)
+        is_expected.to contain_keystone_config('custom_group/mysql_enable_ndb').with_value(true)
       end
     end