diff --git a/manifests/compute/nova.pp b/manifests/compute/nova.pp index 62a93515..d092d2ef 100644 --- a/manifests/compute/nova.pp +++ b/manifests/compute/nova.pp @@ -14,7 +14,7 @@ # # [*auth_type*] # (optional) Authentication type to load -# Defaults to $::os_service_default +# Defaults to 'password' # # [*cafile*] # (optional) PEM encoded Certificate Authority to use when verifying HTTPS @@ -53,7 +53,7 @@ class manila::compute::nova ( $insecure = $::os_service_default, $auth_url = $::os_service_default, - $auth_type = $::os_service_default, + $auth_type = 'password', $cafile = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/manifests/image/glance.pp b/manifests/image/glance.pp index df8ba205..5fe49837 100644 --- a/manifests/image/glance.pp +++ b/manifests/image/glance.pp @@ -18,7 +18,7 @@ # # [*auth_type*] # (optional) Authentication type to load -# Defaults to $::os_service_default +# Defaults to 'password' # # [*cafile*] # (optional) Path to PEM encoded Certificate Authority to use when verifying @@ -66,7 +66,7 @@ class manila::image::glance ( $api_microversion = $::os_service_default, $insecure = $::os_service_default, $auth_url = $::os_service_default, - $auth_type = $::os_service_default, + $auth_type = 'password', $cafile = $::os_service_default, $certfile = $::os_service_default, $keyfile = $::os_service_default, diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index dd363c47..2f4ef418 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -14,7 +14,7 @@ # # [*auth_type*] # (optional) Authentication type to load -# Defaults to $::os_service_default +# Defaults to 'password' # # [*cafile*] # (optional) PEM encoded Certificate Authority to use when verifying HTTPS @@ -65,7 +65,7 @@ class manila::network::neutron ( $insecure = $::os_service_default, $auth_url = $::os_service_default, - $auth_type = $::os_service_default, + $auth_type = 'password', $cafile = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/manifests/volume/cinder.pp b/manifests/volume/cinder.pp index afecf84d..cbcc434d 100644 --- a/manifests/volume/cinder.pp +++ b/manifests/volume/cinder.pp @@ -14,7 +14,7 @@ # # [*auth_type*] # (optional) Authentication type to load -# Defaults to $::os_service_default +# Defaults to 'password' # # [*cafile*] # (optional) PEM encoded Certificate Authority to use when verifying HTTPS @@ -62,7 +62,7 @@ class manila::volume::cinder ( $insecure = $::os_service_default, $auth_url = $::os_service_default, - $auth_type = $::os_service_default, + $auth_type = 'password', $cafile = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/spec/classes/manila_compute_nova_spec.rb b/spec/classes/manila_compute_nova_spec.rb index 2515aac1..53c8b9f6 100644 --- a/spec/classes/manila_compute_nova_spec.rb +++ b/spec/classes/manila_compute_nova_spec.rb @@ -6,7 +6,7 @@ describe 'manila::compute::nova' do it 'configures manila compute nova' do is_expected.to contain_manila_config('nova/insecure').with_value('') is_expected.to contain_manila_config('nova/auth_url').with_value('') - is_expected.to contain_manila_config('nova/auth_type').with_value('') + is_expected.to contain_manila_config('nova/auth_type').with_value('password') is_expected.to contain_manila_config('nova/cafile').with_value('') 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') @@ -23,7 +23,7 @@ describe 'manila::compute::nova' do { :insecure => true, :auth_url => 'http://127.0.0.2:5000/', - :auth_type => 'password', + :auth_type => 'v3password', :cafile => '/etc/ssl/certs/ca.crt', :region_name => 'RegionOne', :endpoint_type => 'publicURL', @@ -35,7 +35,7 @@ describe 'manila::compute::nova' do it 'configures manila nova with overridden parameters' do is_expected.to contain_manila_config('nova/insecure').with_value(true) is_expected.to contain_manila_config('nova/auth_url').with_value('http://127.0.0.2:5000/') - is_expected.to contain_manila_config('nova/auth_type').with_value('password') + is_expected.to contain_manila_config('nova/auth_type').with_value('v3password') 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') diff --git a/spec/classes/manila_image_glance_spec.rb b/spec/classes/manila_image_glance_spec.rb index 0ec239e7..ca8a8e67 100644 --- a/spec/classes/manila_image_glance_spec.rb +++ b/spec/classes/manila_image_glance_spec.rb @@ -7,7 +7,7 @@ describe 'manila::image::glance' do is_expected.to contain_manila_config('glance/api_microversion').with_value('') is_expected.to contain_manila_config('glance/insecure').with_value('') is_expected.to contain_manila_config('glance/auth_url').with_value('') - is_expected.to contain_manila_config('glance/auth_type').with_value('') + is_expected.to contain_manila_config('glance/auth_type').with_value('password') is_expected.to contain_manila_config('glance/cafile').with_value('') is_expected.to contain_manila_config('glance/certfile').with_value('') is_expected.to contain_manila_config('glance/keyfile').with_value('') @@ -27,7 +27,7 @@ describe 'manila::image::glance' do :api_microversion => '2', :insecure => true, :auth_url => 'http://127.0.0.2:5000/', - :auth_type => 'password', + :auth_type => 'v3password', :cafile => '/etc/ssl/certs/ca.crt', :region_name => 'RegionOne', :endpoint_type => 'publicURL', @@ -40,7 +40,7 @@ describe 'manila::image::glance' do is_expected.to contain_manila_config('glance/api_microversion').with_value('2') is_expected.to contain_manila_config('glance/insecure').with_value(true) is_expected.to contain_manila_config('glance/auth_url').with_value('http://127.0.0.2:5000/') - is_expected.to contain_manila_config('glance/auth_type').with_value('password') + is_expected.to contain_manila_config('glance/auth_type').with_value('v3password') is_expected.to contain_manila_config('glance/cafile').with_value('/etc/ssl/certs/ca.crt') is_expected.to contain_manila_config('glance/certfile').with_value('') is_expected.to contain_manila_config('glance/keyfile').with_value('') diff --git a/spec/classes/manila_network_neutron_spec.rb b/spec/classes/manila_network_neutron_spec.rb index 5b51dd3d..fcbe083e 100644 --- a/spec/classes/manila_network_neutron_spec.rb +++ b/spec/classes/manila_network_neutron_spec.rb @@ -6,7 +6,7 @@ describe 'manila::network::neutron' do it 'configures manila network neutron' do is_expected.to contain_manila_config('neutron/insecure').with_value('') is_expected.to contain_manila_config('neutron/auth_url').with_value('') - is_expected.to contain_manila_config('neutron/auth_type').with_value('') + is_expected.to contain_manila_config('neutron/auth_type').with_value('password') is_expected.to contain_manila_config('neutron/cafile').with_value('') 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') @@ -26,7 +26,7 @@ describe 'manila::network::neutron' do { :insecure => true, :auth_url => 'http://127.0.0.2:5000/', - :auth_type => 'password', + :auth_type => 'v3password', :cafile => '/etc/ssl/certs/ca.crt', :region_name => 'RegionOne', :timeout => 30, @@ -42,7 +42,7 @@ describe 'manila::network::neutron' do is_expected.to contain_manila_config('DEFAULT/network_api_class').with_value('manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin') is_expected.to contain_manila_config('neutron/insecure').with_value(true) is_expected.to contain_manila_config('neutron/auth_url').with_value('http://127.0.0.2:5000/') - is_expected.to contain_manila_config('neutron/auth_type').with_value('password') + is_expected.to contain_manila_config('neutron/auth_type').with_value('v3password') 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') diff --git a/spec/classes/manila_volume_cinder_spec.rb b/spec/classes/manila_volume_cinder_spec.rb index e674ac9e..35211bd0 100644 --- a/spec/classes/manila_volume_cinder_spec.rb +++ b/spec/classes/manila_volume_cinder_spec.rb @@ -6,7 +6,7 @@ describe 'manila::volume::cinder' do it 'configures manila volume cinder' do is_expected.to contain_manila_config('cinder/insecure').with_value('') is_expected.to contain_manila_config('cinder/auth_url').with_value('') - is_expected.to contain_manila_config('cinder/auth_type').with_value('') + is_expected.to contain_manila_config('cinder/auth_type').with_value('password') is_expected.to contain_manila_config('cinder/cafile').with_value('') is_expected.to contain_manila_config('cinder/region_name').with_value('') is_expected.to contain_manila_config('cinder/endpoint_type').with_value('') @@ -25,7 +25,7 @@ describe 'manila::volume::cinder' do { :insecure => true, :auth_url => 'http://127.0.0.2:5000/', - :auth_type => 'password', + :auth_type => 'v3password', :cafile => '/etc/ssl/certs/ca.crt', :region_name => 'RegionOne', :endpoint_type => 'publicURL', @@ -39,7 +39,7 @@ describe 'manila::volume::cinder' do it 'configures manila cinder with overridden parameters' do is_expected.to contain_manila_config('cinder/insecure').with_value(true) is_expected.to contain_manila_config('cinder/auth_url').with_value('http://127.0.0.2:5000/') - is_expected.to contain_manila_config('cinder/auth_type').with_value('password') + is_expected.to contain_manila_config('cinder/auth_type').with_value('v3password') is_expected.to contain_manila_config('cinder/cafile').with_value('/etc/ssl/certs/ca.crt') is_expected.to contain_manila_config('cinder/user_domain_name').with_value('Default') is_expected.to contain_manila_config('cinder/project_domain_name').with_value('Default')