Merge "Consistent project name"

manifests/metadata/novajoin/api.pp

@@ -86,7 +86,7 @@
 #
 # [*project_name*]
 #   (optional) Project name (for novajoin auth).
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 # [*user_domain_id*]
 #   (optional) Domain for novajoin user.
@@ -122,7 +122,7 @@ class nova::metadata::novajoin::api (
   $service_password          = undef,
   $service_user              = 'novajoin',
   $project_domain_name       = 'default',
-  $project_name              = 'service',
+  $project_name              = 'services',
   $user_domain_id            = 'default',
   $configure_kerberos        = false,
   $ipa_realm                 = undef,

releasenotes/notes/consistent-project-name-40ef75b7e11461f4.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The default value for nova::metadata::novajoin::api::project_name has
+    been changed from 'service' to 'services'.

spec/classes/nova_metadata_novajoin_api_spec.rb

@@ -19,7 +19,7 @@ describe 'nova::metadata::novajoin::api' do
       :manage_service            => true,
       :service_user              => 'novajoin',
       :project_domain_name       => 'default',
-      :project_name              => 'service',
+      :project_name              => 'services',
       :user_domain_id            => 'default',
       :ipa_domain                => 'EXAMPLE.COM',
       :keystone_auth_url         => 'https://keystone.example.com:5000',
@@ -54,7 +54,7 @@ describe 'nova::metadata::novajoin::api' do
        :manage_service            => true,
        :service_user              => 'novajoin1',
        :project_domain_name       => 'default',
-       :project_name              => 'service',
+       :project_name              => 'services',
        :user_domain_id            => 'default',
        :ipa_domain                => 'EXAMPLE2.COM',
        :keystone_auth_url         => 'https://keystone2.example.com:5000',