openstack/puppet-manila
Code Issues Proposed changes

Merge "Set auth_type by default"

Browse Source
This commit is contained in:
Zuul 2021-10-09 02:09:56 +00:00 committed by Gerrit Code Review
commit a65a3f6d9b
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/nova.pp
View File

@ -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',

4
manifests/image/glance.pp
View File

@ -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,

4
manifests/network/neutron.pp
View File

@ -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',

4
manifests/volume/cinder.pp
View File

@ -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',

6
spec/classes/manila_compute_nova_spec.rb
View File

@ -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('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/auth_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('nova/auth_type').with_value('password')
is_expected.to contain_manila_config('nova/cafile').with_value('<SERVICE DEFAULT>')
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')

6
spec/classes/manila_image_glance_spec.rb
View File

@ -7,7 +7,7 @@ describe 'manila::image::glance' do
is_expected.to contain_manila_config('glance/api_microversion').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/insecure').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/auth_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/auth_type').with_value('password')
is_expected.to contain_manila_config('glance/cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/certfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/keyfile').with_value('<SERVICE DEFAULT>')
@ -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('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('glance/keyfile').with_value('<SERVICE DEFAULT>')

6
spec/classes/manila_network_neutron_spec.rb
View File

@ -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('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('neutron/auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('neutron/auth_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('neutron/auth_type').with_value('password')
is_expected.to contain_manila_config('neutron/cafile').with_value('<SERVICE DEFAULT>')
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')

6
spec/classes/manila_volume_cinder_spec.rb
View File

@ -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('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/auth_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/auth_type').with_value('password')
is_expected.to contain_manila_config('cinder/cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('cinder/endpoint_type').with_value('<SERVICE DEFAULT>')
@ -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')