From e20e49794d8815642749ef643a154b3e561737e0 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 26 Aug 2020 11:53:17 +0800
Subject: [PATCH] Add mysql_enable_ndb option

Add mysql_enable_ndb parameter to select mysql storage engine.

Change-Id: I8a80b9162eda1932e97950383011ea8301cc19ff
Depends-On: https://review.opendev.org/#/c/748067
Closes-Bug: #1892952
---
 manifests/db.pp                                            | 7 +++++++
 .../add_mysql_enable_ndb-option-b20b3aee3ac8b604.yaml      | 4 ++++
 spec/classes/nova_db_spec.rb                               | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/add_mysql_enable_ndb-option-b20b3aee3ac8b604.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 798bff35a..493805cbc 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -67,6 +67,11 @@
 #   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
 #   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
 #
 # [*database_min_pool_size*]
@@ -85,6 +90,7 @@ class nova::db (
   $database_retry_interval          = $::os_service_default,
   $database_max_overflow            = $::os_service_default,
   $database_pool_timeout            = $::os_service_default,
+  $mysql_enable_ndb                 = $::os_service_default,
   # DEPRECATED PARAMETERS
   $database_min_pool_size           = undef,
 ) {
@@ -122,6 +128,7 @@ class nova::db (
       retry_interval          => $database_retry_interval_real,
       max_overflow            => $database_max_overflow_real,
       pool_timeout            => $database_pool_timeout,
+      mysql_enable_ndb        => $mysql_enable_ndb,
       slave_connection        => $slave_connection_real,
     }
   }
diff --git a/releasenotes/notes/add_mysql_enable_ndb-option-b20b3aee3ac8b604.yaml b/releasenotes/notes/add_mysql_enable_ndb-option-b20b3aee3ac8b604.yaml
new file mode 100644
index 000000000..2e28c5c66
--- /dev/null
+++ b/releasenotes/notes/add_mysql_enable_ndb-option-b20b3aee3ac8b604.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add mysql_enable_ndb parameter to select mysql storage engine.
diff --git a/spec/classes/nova_db_spec.rb b/spec/classes/nova_db_spec.rb
index 0bcedd882..e2d65e082 100644
--- a/spec/classes/nova_db_spec.rb
+++ b/spec/classes/nova_db_spec.rb
@@ -18,6 +18,7 @@ describe 'nova::db' do
       it { should_not contain_nova_config('database/retry_interval') }
       it { should_not contain_nova_config('database/max_overflow') }
       it { should_not contain_nova_config('database/pool_timeout') }
+      it { should_not contain_nova_config('database/mysql_enable_ndb') }
     end
 
     context 'with overridden parameters' do
@@ -40,6 +41,7 @@ describe 'nova::db' do
         :retry_interval          => '<SERVICE DEFAULT>',
         :max_overflow            => '<SERVICE DEFAULT>',
         :pool_timeout            => '<SERVICE DEFAULT>',
+        :mysql_enable_ndb        => '<SERVICE DEFAULT>',
       )}
 
       it { should contain_nova_config('api_database/connection').with_value('mysql+pymysql://user:pass@db/db2').with_secret(true) }