openstack
/
puppet-manila
Code Issues Proposed changes

Merge "Consistent project name"

This commit is contained in:
Zuul 2019-05-28 15:16:21 +00:00 committed by Gerrit Code Review
parent f0ca1f7ecb 636c3d2a89
commit 5c8cd44129
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/nova.pp
View File

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

4
manifests/network/neutron.pp
View File

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

4
manifests/volume/cinder.pp
View File

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

7
releasenotes/notes/consistent-project-name-55f3f0d8b3dba962.yaml Normal file
View File

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

2
spec/classes/manila_compute_nova_spec.rb
View File

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

2
spec/classes/manila_network_neutron_spec.rb
View File

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