From 05cc781e6ed314c89dd7438c4fed306bf6471f2e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sat, 25 May 2019 01:08:26 +0200
Subject: [PATCH] Consistent project name

Change-Id: I8f9bad9a6225c687b0dd72eb4904ba5f9bdaaf5f
---
 manifests/nova.pp                                            | 4 ++--
 .../notes/consistent-project-name-769987b2337a8434.yaml      | 5 +++++
 spec/classes/cinder_nova_spec.rb                             | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/consistent-project-name-769987b2337a8434.yaml

diff --git a/manifests/nova.pp b/manifests/nova.pp
index 9c3a0fa9..acc2d548 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -73,7 +73,7 @@
 #
 # [*project_name*]
 #   (Optional) Nova admin project name.
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 # [*project_domain_name*]
 #   (Optional) Nova admin project domain name.
@@ -96,7 +96,7 @@ class cinder::nova (
   $username            = 'nova',
   $user_domain_name    = 'Default',
   $password            = undef,
-  $project_name        = 'service',
+  $project_name        = 'services',
   $project_domain_name = 'Default',
 ) {
 
diff --git a/releasenotes/notes/consistent-project-name-769987b2337a8434.yaml b/releasenotes/notes/consistent-project-name-769987b2337a8434.yaml
new file mode 100644
index 00000000..2ce16e24
--- /dev/null
+++ b/releasenotes/notes/consistent-project-name-769987b2337a8434.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The default value of cinder::nova::project_name is changed from 'service'
+    to 'services'.
diff --git a/spec/classes/cinder_nova_spec.rb b/spec/classes/cinder_nova_spec.rb
index e3811b01..9c3ad208 100644
--- a/spec/classes/cinder_nova_spec.rb
+++ b/spec/classes/cinder_nova_spec.rb
@@ -64,7 +64,7 @@ describe 'cinder::nova' do
         is_expected.to contain_cinder_config('nova/username').with_value('nova')
         is_expected.to contain_cinder_config('nova/user_domain_name').with_value('Default')
         is_expected.to contain_cinder_config('nova/password').with_value('foo')
-        is_expected.to contain_cinder_config('nova/project_name').with_value('service')
+        is_expected.to contain_cinder_config('nova/project_name').with_value('services')
         is_expected.to contain_cinder_config('nova/project_domain_name').with_value('Default')
       }
     end