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

Change-Id: Ie177c0281918a5789042345b5fbe51c16b5b815e
---
 manifests/compute/nova.pp                                  | 4 ++--
 manifests/network/neutron.pp                               | 4 ++--
 manifests/volume/cinder.pp                                 | 4 ++--
 .../notes/consistent-project-name-55f3f0d8b3dba962.yaml    | 7 +++++++
 spec/classes/manila_compute_nova_spec.rb                   | 2 +-
 spec/classes/manila_network_neutron_spec.rb                | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/consistent-project-name-55f3f0d8b3dba962.yaml

diff --git a/manifests/compute/nova.pp b/manifests/compute/nova.pp
index 8b3c4de5..25c21c42 100644
--- a/manifests/compute/nova.pp
+++ b/manifests/compute/nova.pp
@@ -31,7 +31,7 @@
 #
 # [*project_name*]
 #   (optional) Project name to scope to
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 # [*region_name*]
 #   (optional) Region name for connecting to nova
@@ -95,7 +95,7 @@ class manila::compute::nova (
   $cafile                    = $::os_service_default,
   $user_domain_name          = 'Default',
   $project_domain_name       = 'Default',
-  $project_name              = 'service',
+  $project_name              = 'services',
   $region_name               = $::os_service_default,
   $endpoint_type             = $::os_service_default,
   $username                  = 'nova',
diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp
index 93802dea..640eb00a 100644
--- a/manifests/network/neutron.pp
+++ b/manifests/network/neutron.pp
@@ -31,7 +31,7 @@
 #
 # [*project_name*]
 #   (optional) Project name to scope to
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 # [*region_name*]
 #   (optional) Region name for connecting to neutron
@@ -113,7 +113,7 @@ class manila::network::neutron (
   $cafile                       = $::os_service_default,
   $user_domain_name             = 'Default',
   $project_domain_name          = 'Default',
-  $project_name                 = 'service',
+  $project_name                 = 'services',
   $region_name                  = $::os_service_default,
   $timeout                      = $::os_service_default,
   $endpoint_type                = $::os_service_default,
diff --git a/manifests/volume/cinder.pp b/manifests/volume/cinder.pp
index 7487935e..cbc7ea0b 100644
--- a/manifests/volume/cinder.pp
+++ b/manifests/volume/cinder.pp
@@ -38,7 +38,7 @@
 #
 # [*cinder_admin_tenant_name*]
 # (optional) Cinder admin tenant name
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 # [*cinder_admin_auth_url*]
 # (optional) Identity service url
@@ -52,7 +52,7 @@ class manila::volume::cinder (
   $cinder_cross_az_attach      = true,
   $cinder_admin_username       = 'cinder',
   $cinder_admin_password       = undef,
-  $cinder_admin_tenant_name    = 'service',
+  $cinder_admin_tenant_name    = 'services',
   $cinder_admin_auth_url       = 'http://localhost:5000/v3',
 ) {
 
diff --git a/releasenotes/notes/consistent-project-name-55f3f0d8b3dba962.yaml b/releasenotes/notes/consistent-project-name-55f3f0d8b3dba962.yaml
new file mode 100644
index 00000000..8bd084f0
--- /dev/null
+++ b/releasenotes/notes/consistent-project-name-55f3f0d8b3dba962.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The default value of manila::compute::nova::project_name,
+    manila::network::neutron::project_name and
+    manila::volume::cinder::cinder_admin_tenant_name has been changed from
+    'service' to 'services'.
diff --git a/spec/classes/manila_compute_nova_spec.rb b/spec/classes/manila_compute_nova_spec.rb
index a085b29d..1ecb74d9 100644
--- a/spec/classes/manila_compute_nova_spec.rb
+++ b/spec/classes/manila_compute_nova_spec.rb
@@ -41,7 +41,7 @@ describe 'manila::compute::nova' do
         is_expected.to contain_manila_config('nova/cafile').with_value('/etc/ssl/certs/ca.crt')
         is_expected.to contain_manila_config('nova/user_domain_name').with_value('Default')
         is_expected.to contain_manila_config('nova/project_domain_name').with_value('Default')
-        is_expected.to contain_manila_config('nova/project_name').with_value('service')
+        is_expected.to contain_manila_config('nova/project_name').with_value('services')
         is_expected.to contain_manila_config('nova/region_name').with_value('RegionOne')
         is_expected.to contain_manila_config('nova/endpoint_type').with_value('publicURL')
         is_expected.to contain_manila_config('nova/username').with_value('novav1')
diff --git a/spec/classes/manila_network_neutron_spec.rb b/spec/classes/manila_network_neutron_spec.rb
index 3d842cf9..4e6a6c83 100644
--- a/spec/classes/manila_network_neutron_spec.rb
+++ b/spec/classes/manila_network_neutron_spec.rb
@@ -48,7 +48,7 @@ describe 'manila::network::neutron' do
         is_expected.to contain_manila_config('neutron/cafile').with_value('/etc/ssl/certs/ca.crt')
         is_expected.to contain_manila_config('neutron/user_domain_name').with_value('Default')
         is_expected.to contain_manila_config('neutron/project_domain_name').with_value('Default')
-        is_expected.to contain_manila_config('neutron/project_name').with_value('service')
+        is_expected.to contain_manila_config('neutron/project_name').with_value('services')
         is_expected.to contain_manila_config('neutron/region_name').with_value('RegionOne')
         is_expected.to contain_manila_config('neutron/timeout').with_value(30)
         is_expected.to contain_manila_config('neutron/endpoint_type').with_value('publicURL')