Configure *_domain_name to Default by default

Keystone v2.0 API was removed so we have no choice but configuring
user_domain_name and project_domain_name otherwise it fallbacks to
Keystone v2.0 and it fails. This patch sets the default value so we make
sure Keystone v3 will be used out of the box for our users.

Change-Id: Ica121aa31705551052448a853fb8908732e749cf

manifests/api/authtoken.pp

@@ -22,11 +22,11 @@
 #
 # [*user_domain_name*]
 #   (Optional) Name of domain for $username
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   (Optional) Name of domain for $project_name
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*insecure*]
 #   (Optional) If true, explicitly allow TLS without checking server cert
@@ -192,8 +192,8 @@ class ironic::api::authtoken(
   $password                       = $::os_service_default,
   $auth_url                       = 'http://127.0.0.1:35357',
   $project_name                   = 'services',
-  $user_domain_name               = $::os_service_default,
-  $project_domain_name            = $::os_service_default,
+  $user_domain_name               = 'Default',
+  $project_domain_name            = 'Default',
   $insecure                       = $::os_service_default,
   $auth_section                   = $::os_service_default,
   $auth_type                      = 'password',

manifests/cinder.pp

@@ -34,11 +34,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 class ironic::cinder (
   $auth_type           = 'password',
@@ -46,8 +46,8 @@ class ironic::cinder (
   $project_name        = 'services',
   $username            = 'ironic',
   $password            = $::os_service_default,
-  $user_domain_name    = $::os_service_default,
-  $project_domain_name = $::os_service_default,
+  $user_domain_name    = 'Default',
+  $project_domain_name = 'Default',
 ) {
 
   ironic_config {

manifests/drivers/inspector.pp

@@ -46,11 +46,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 class ironic::drivers::inspector (
   $enabled             = $::os_service_default,
@@ -60,8 +60,8 @@ class ironic::drivers::inspector (
   $project_name        = 'services',
   $username            = 'ironic',
   $password            = $::os_service_default,
-  $user_domain_name    = $::os_service_default,
-  $project_domain_name = $::os_service_default,
+  $user_domain_name    = 'Default',
+  $project_domain_name = 'Default',
 ) {
 
   include ::ironic::deps

manifests/glance.pp

@@ -34,11 +34,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*api_servers*]
 #   (optional) A list of the glance api servers available to ironic.
@@ -82,8 +82,8 @@ class ironic::glance (
   $project_name               = 'services',
   $username                   = 'ironic',
   $password                   = $::os_service_default,
-  $user_domain_name           = $::os_service_default,
-  $project_domain_name        = $::os_service_default,
+  $user_domain_name           = 'Default',
+  $project_domain_name        = 'Default',
   $api_servers                = $::os_service_default,
   $num_retries                = $::os_service_default,
   $api_insecure               = $::os_service_default,

manifests/inspector.pp

@@ -86,11 +86,11 @@
 #
 # [*ironic_project_domain_name*]
 #   (Optional) Name of domain for $ironic_tenant_name
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*ironic_user_domain_name*]
 #   (Optional) Name of domain for $ironic_username
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*ironic_auth_url*]
 #   (optional) Keystone authentication URL for Ironic
@@ -122,11 +122,11 @@
 #
 # [*swift_project_domain_name*]
 #   (Optional) Name of domain for $swift_tenant_name
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*swift_user_domain_name*]
 #   (Optional) Name of domain for $swift_username
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*swift_auth_url*]
 #   (optional) Keystone authentication URL for Swift
@@ -230,8 +230,8 @@ class ironic::inspector (
   $ironic_username                 = 'ironic',
   $ironic_password                 = undef,
   $ironic_tenant_name              = 'services',
-  $ironic_project_domain_name      = $::os_service_default,
-  $ironic_user_domain_name         = $::os_service_default,
+  $ironic_project_domain_name      = 'Default',
+  $ironic_user_domain_name         = 'Default',
   $ironic_auth_url                 = 'http://127.0.0.1:5000/v2.0',
   $ironic_max_retries              = 30,
   $ironic_retry_interval           = 2,
@@ -239,8 +239,8 @@ class ironic::inspector (
   $swift_username                  = 'ironic',
   $swift_password                  = undef,
   $swift_tenant_name               = 'services',
-  $swift_project_domain_name       = $::os_service_default,
-  $swift_user_domain_name          = $::os_service_default,
+  $swift_project_domain_name       = 'Default',
+  $swift_user_domain_name          = 'Default',
   $swift_auth_url                  = 'http://127.0.0.1:5000/v2.0',
   $dnsmasq_ip_subnets              = [],
   $dnsmasq_local_ip                = '192.168.0.1',

manifests/inspector/authtoken.pp

@@ -22,11 +22,11 @@
 #
 # [*user_domain_name*]
 #   (Optional) Name of domain for $username
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   (Optional) Name of domain for $project_name
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*insecure*]
 #   (Optional) If true, explicitly allow TLS without checking server cert
@@ -192,8 +192,8 @@ class ironic::inspector::authtoken(
   $password                       = $::os_service_default,
   $auth_url                       = 'http://127.0.0.1:35357',
   $project_name                   = 'services',
-  $user_domain_name               = $::os_service_default,
-  $project_domain_name            = $::os_service_default,
+  $user_domain_name               = 'Default',
+  $project_domain_name            = 'Default',
   $insecure                       = $::os_service_default,
   $auth_section                   = $::os_service_default,
   $auth_type                      = 'password',

manifests/neutron.pp

@@ -38,11 +38,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 class ironic::neutron (
   $api_endpoint        = $::os_service_default,
@@ -51,8 +51,8 @@ class ironic::neutron (
   $project_name        = 'services',
   $username            = 'ironic',
   $password            = $::os_service_default,
-  $user_domain_name    = $::os_service_default,
-  $project_domain_name = $::os_service_default,
+  $user_domain_name    = 'Default',
+  $project_domain_name = 'Default',
 ) {
 
   $api_endpoint_real = pick($::ironic::api::neutron_url, $api_endpoint)

manifests/service_catalog.pp

@@ -34,11 +34,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 class ironic::service_catalog (
   $auth_type           = 'password',
@@ -46,8 +46,8 @@ class ironic::service_catalog (
   $project_name        = 'services',
   $username            = 'ironic',
   $password            = $::os_service_default,
-  $user_domain_name    = $::os_service_default,
-  $project_domain_name = $::os_service_default,
+  $user_domain_name    = 'Default',
+  $project_domain_name = 'Default',
 ) {
 
   include ::ironic::deps

manifests/swift.pp

@@ -34,11 +34,11 @@
 #
 # [*user_domain_name*]
 #   The name of user's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   The name of project's domain (required for Identity V3).
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 class ironic::swift (
   $auth_type           = 'password',
@@ -46,8 +46,8 @@ class ironic::swift (
   $project_name        = 'services',
   $username            = 'ironic',
   $password            = $::os_service_default,
-  $user_domain_name    = $::os_service_default,
-  $project_domain_name = $::os_service_default,
+  $user_domain_name    = 'Default',
+  $project_domain_name = 'Default',
 ) {
 
   ironic_config {

releasenotes/notes/default-domain-ac0128c3e0820ff6.yaml

@@ -0,0 +1,7 @@
+---
+issues:
+  - |
+    Keystone v2.0 API was removed so we need to set a default value
+    for user_domain_name and project_domain name, which will be
+    Default as it is already in some other classes in modules.
+

spec/classes/ironic_api_authtoken_spec.rb

@@ -15,8 +15,8 @@ describe 'ironic::api::authtoken' do
         is_expected.to contain_ironic_config('keystone_authtoken/password').with_value('ironic_password')
         is_expected.to contain_ironic_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
         is_expected.to contain_ironic_config('keystone_authtoken/project_name').with_value('services')
-        is_expected.to contain_ironic_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_ironic_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('keystone_authtoken/user_domain_name').with_value('Default')
+        is_expected.to contain_ironic_config('keystone_authtoken/project_domain_name').with_value('Default')
         is_expected.to contain_ironic_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_config('keystone_authtoken/auth_type').with_value('password')

spec/classes/ironic_cinder_spec.rb

@@ -39,8 +39,8 @@ describe 'ironic::cinder' do
       is_expected.to contain_ironic_config('cinder/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('cinder/username').with_value(p[:username])
       is_expected.to contain_ironic_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('Default')
     end
 
     context 'when overriding parameters' do

spec/classes/ironic_drivers_inspector_spec.rb

@@ -41,8 +41,8 @@ describe 'ironic::drivers::inspector' do
       is_expected.to contain_ironic_config('inspector/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('inspector/username').with_value(p[:username])
       is_expected.to contain_ironic_config('inspector/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('inspector/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('inspector/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('inspector/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('inspector/project_domain_name').with_value('Default')
     end
 
     context 'when overriding parameters' do

spec/classes/ironic_glance_spec.rb

@@ -39,8 +39,8 @@ describe 'ironic::glance' do
       is_expected.to contain_ironic_config('glance/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('glance/username').with_value(p[:username])
       is_expected.to contain_ironic_config('glance/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('glance/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('glance/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('glance/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('glance/project_domain_name').with_value('Default')
       is_expected.to contain_ironic_config('glance/glance_api_servers').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('glance/glance_api_insecure').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('glance/glance_num_retries').with_value('<SERVICE DEFAULT>')

spec/classes/ironic_inspector_authtoken_spec.rb

@@ -15,8 +15,8 @@ describe 'ironic::inspector::authtoken' do
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/password').with_value('ironic_password')
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_name').with_value('services')
-        is_expected.to contain_ironic_inspector_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_inspector_config('keystone_authtoken/user_domain_name').with_value('Default')
+        is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_domain_name').with_value('Default')
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_type').with_value('password')

spec/classes/ironic_inspector_spec.rb

@@ -110,16 +110,16 @@ describe 'ironic::inspector' do
       is_expected.to contain_ironic_inspector_config('ironic/auth_type').with_value(p[:ironic_auth_type])
       is_expected.to contain_ironic_inspector_config('ironic/username').with_value(p[:ironic_username])
       is_expected.to contain_ironic_inspector_config('ironic/project_name').with_value(p[:ironic_tenant_name])
-      is_expected.to contain_ironic_inspector_config('ironic/project_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_inspector_config('ironic/user_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_inspector_config('ironic/project_domain_name').with_value('Default')
+      is_expected.to contain_ironic_inspector_config('ironic/user_domain_name').with_value('Default')
       is_expected.to contain_ironic_inspector_config('ironic/auth_url').with_value(p[:ironic_auth_url])
       is_expected.to contain_ironic_inspector_config('ironic/max_retries').with_value(p[:ironic_max_retries])
       is_expected.to contain_ironic_inspector_config('ironic/retry_interval').with_value(p[:ironic_retry_interval])
       is_expected.to contain_ironic_inspector_config('swift/auth_type').with_value(p[:swift_auth_type])
       is_expected.to contain_ironic_inspector_config('swift/username').with_value(p[:swift_username])
       is_expected.to contain_ironic_inspector_config('swift/project_name').with_value(p[:swift_tenant_name])
-      is_expected.to contain_ironic_inspector_config('swift/project_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_inspector_config('swift/user_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_inspector_config('swift/project_domain_name').with_value('Default')
+      is_expected.to contain_ironic_inspector_config('swift/user_domain_name').with_value('Default')
       is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value(p[:swift_auth_url])
       is_expected.to contain_ironic_inspector_config('processing/processing_hooks').with_value('$default_processing_hooks')
       is_expected.to contain_ironic_inspector_config('processing/node_not_found_hook').with_value('<SERVICE DEFAULT>')

spec/classes/ironic_neutron_spec.rb

@@ -40,8 +40,8 @@ describe 'ironic::neutron' do
       is_expected.to contain_ironic_config('neutron/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('neutron/username').with_value(p[:username])
       is_expected.to contain_ironic_config('neutron/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('neutron/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('neutron/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('neutron/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('neutron/project_domain_name').with_value('Default')
     end
 
     context 'when overriding parameters' do

spec/classes/ironic_service_catalog_spec.rb

@@ -39,8 +39,8 @@ describe 'ironic::service_catalog' do
       is_expected.to contain_ironic_config('service_catalog/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('service_catalog/username').with_value(p[:username])
       is_expected.to contain_ironic_config('service_catalog/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('service_catalog/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('service_catalog/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('service_catalog/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('service_catalog/project_domain_name').with_value('Default')
     end
 
     context 'when overriding parameters' do

spec/classes/ironic_swift_spec.rb

@@ -39,8 +39,8 @@ describe 'ironic::swift' do
       is_expected.to contain_ironic_config('swift/project_name').with_value(p[:project_name])
       is_expected.to contain_ironic_config('swift/username').with_value(p[:username])
       is_expected.to contain_ironic_config('swift/password').with_value('<SERVICE DEFAULT>').with_secret(true)
-      is_expected.to contain_ironic_config('swift/user_domain_name').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('swift/project_domain_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('swift/user_domain_name').with_value('Default')
+      is_expected.to contain_ironic_config('swift/project_domain_name').with_value('Default')
     end
 
     context 'when overriding parameters' do