From 684fe638dea049163042194a468352f6816b4e85 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 13 Oct 2021 22:13:43 +0900
Subject: [PATCH] Add support for [nova] api_micro_version

Manila provides the api_micro_version for Nova and Glance but currently
the parameter is implemented for only Glance.
This change adds the parameter to the nova class so that api version
can be defined for both of these two services.

Change-Id: I6ab2257febe68eff05c0a1ea903ab84e3292f4ee
---
 manifests/compute/nova.pp                     |  6 ++++++
 ...va-api_micro_version-0d73fb87757e0c3e.yaml |  5 +++++
 spec/classes/manila_compute_nova_spec.rb      | 19 +++++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/nova-api_micro_version-0d73fb87757e0c3e.yaml

diff --git a/manifests/compute/nova.pp b/manifests/compute/nova.pp
index d092d2ef..c41d65e6 100644
--- a/manifests/compute/nova.pp
+++ b/manifests/compute/nova.pp
@@ -50,6 +50,10 @@
 #   (optional) User's password
 #   Defaults to $::os_service_default
 #
+# [*api_microversion*]
+#   (optional) Version of Nova API to be used
+#   Defaults to $::os_service_default
+#
 class manila::compute::nova (
   $insecure                  = $::os_service_default,
   $auth_url                  = $::os_service_default,
@@ -62,6 +66,7 @@ class manila::compute::nova (
   $endpoint_type             = $::os_service_default,
   $username                  = 'nova',
   $password                  = $::os_service_default,
+  $api_microversion          = $::os_service_default,
 ) {
 
   include manila::deps
@@ -78,5 +83,6 @@ class manila::compute::nova (
     'nova/password':            value => $password, secret => true;
     'nova/project_name':        value => $project_name;
     'nova/project_domain_name': value => $project_domain_name;
+    'nova/api_microversion':    value => $api_microversion;
   }
 }
diff --git a/releasenotes/notes/nova-api_micro_version-0d73fb87757e0c3e.yaml b/releasenotes/notes/nova-api_micro_version-0d73fb87757e0c3e.yaml
new file mode 100644
index 00000000..710542f3
--- /dev/null
+++ b/releasenotes/notes/nova-api_micro_version-0d73fb87757e0c3e.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``manila::compute::nova::api_micro_version`` parameter has been
+    added.
diff --git a/spec/classes/manila_compute_nova_spec.rb b/spec/classes/manila_compute_nova_spec.rb
index 53c8b9f6..0165ccaa 100644
--- a/spec/classes/manila_compute_nova_spec.rb
+++ b/spec/classes/manila_compute_nova_spec.rb
@@ -15,20 +15,22 @@ describe 'manila::compute::nova' do
         is_expected.to contain_manila_config('nova/endpoint_type').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_manila_config('nova/username').with_value('nova')
         is_expected.to contain_manila_config('nova/password').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_manila_config('nova/api_microversion').with_value('<SERVICE DEFAULT>')
       end
     end
 
     context 'with overridden parameters' do
       let :params do
         {
-          :insecure       => true,
-          :auth_url       => 'http://127.0.0.2:5000/',
-          :auth_type      => 'v3password',
-          :cafile         => '/etc/ssl/certs/ca.crt',
-          :region_name    => 'RegionOne',
-          :endpoint_type  => 'publicURL',
-          :username       => 'novav1',
-          :password       => '123123',
+          :insecure         => true,
+          :auth_url         => 'http://127.0.0.2:5000/',
+          :auth_type        => 'v3password',
+          :cafile           => '/etc/ssl/certs/ca.crt',
+          :region_name      => 'RegionOne',
+          :endpoint_type    => 'publicURL',
+          :username         => 'novav1',
+          :password         => '123123',
+          :api_microversion => '2.10'
         }
       end
 
@@ -44,6 +46,7 @@ describe 'manila::compute::nova' do
         is_expected.to contain_manila_config('nova/endpoint_type').with_value('publicURL')
         is_expected.to contain_manila_config('nova/username').with_value('novav1')
         is_expected.to contain_manila_config('nova/password').with_value('123123').with_secret(true)
+        is_expected.to contain_manila_config('nova/api_microversion').with_value('2.10')
        end
     end
   end