openstack/puppet-manila
Code Issues Proposed changes

Convert all class usage to relative names

Browse Source 
Change-Id: Ia6a3c71dbca4659ff9375ae813f990b162e57c02
This commit is contained in:
Tobias Urdin 2019-12-08 23:10:29 +01:00
parent e530c8bc71
commit 38c4e3104a
38 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@ -99,9 +99,9 @@ class manila::api (
$os_region_name = undef, $os_region_name = undef,
) inherits manila::params { ) inherits manila::params {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
include ::manila::policy include manila::policy
require ::keystone::client require ::keystone::client
if $service_port { if $service_port {
@ -121,7 +121,7 @@ class manila::api (
} }
if $sync_db { if $sync_db {
include ::manila::db::sync include manila::db::sync
} }
if $enabled { if $enabled {
@ -146,7 +146,7 @@ class manila::api (
} elsif $service_name == 'httpd' { } elsif $service_name == 'httpd' {
# We need to make sure manila-api/eventlet is stopped before trying to # We need to make sure manila-api/eventlet is stopped before trying to
# start apache # start apache
include ::apache::params include apache::params
service { 'manila-api': service { 'manila-api':
ensure => 'stopped', ensure => 'stopped',
name => $::manila::params::api_service, name => $::manila::params::api_service,
@ -177,7 +177,7 @@ server.")
manila_config { manila_config {
'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/auth_strategy': value => $auth_strategy;
} }
include ::manila::keystone::authtoken include manila::keystone::authtoken
if ($ratelimits != undef) { if ($ratelimits != undef) {
manila_api_paste_ini { manila_api_paste_ini {

2
manifests/backend/cephfs.pp
View File

@ -83,7 +83,7 @@ define manila::backend::cephfs (
$cephfs_protocol_helper_type = 'CEPHFS', $cephfs_protocol_helper_type = 'CEPHFS',
) { ) {
include ::manila::deps include manila::deps
$share_driver = 'manila.share.drivers.cephfs.driver.CephFSDriver' $share_driver = 'manila.share.drivers.cephfs.driver.CephFSDriver'

2
manifests/backend/dellemc_isilon.pp
View File

@ -67,7 +67,7 @@ define manila::backend::dellemc_isilon (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $emc_nas_password) validate_legacy(String, 'validate_string', $emc_nas_password)

2
manifests/backend/dellemc_unity.pp
View File

@ -92,7 +92,7 @@ define manila::backend::dellemc_unity (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $emc_nas_password) validate_legacy(String, 'validate_string', $emc_nas_password)

2
manifests/backend/dellemc_vmax.pp
View File

@ -71,7 +71,7 @@ define manila::backend::dellemc_vmax (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $emc_nas_password) validate_legacy(String, 'validate_string', $emc_nas_password)

2
manifests/backend/dellemc_vnx.pp
View File

@ -91,7 +91,7 @@ define manila::backend::dellemc_vnx (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $emc_nas_password) validate_legacy(String, 'validate_string', $emc_nas_password)

2
manifests/backend/generic.pp
View File

@ -88,7 +88,7 @@ define manila::backend::generic (
$automatic_share_server_cleanup = 'True', $automatic_share_server_cleanup = 'True',
) { ) {
include ::manila::deps include manila::deps
$share_driver = 'manila.share.drivers.generic.GenericShareDriver' $share_driver = 'manila.share.drivers.generic.GenericShareDriver'

2
manifests/backend/glusterfs.pp
View File

@ -28,7 +28,7 @@ define manila::backend::glusterfs (
$glusterfs_mount_point_base = '$state_path/mnt', $glusterfs_mount_point_base = '$state_path/mnt',
) { ) {
include ::manila::deps include manila::deps
$share_driver = 'manila.share.drivers.glusterfs.GlusterfsShareDriver' $share_driver = 'manila.share.drivers.glusterfs.GlusterfsShareDriver'
manila_config { manila_config {

4
manifests/backend/glusternative.pp
View File

@ -31,8 +31,8 @@ define manila::backend::glusternative (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
$share_driver = 'manila.share.drivers.glusterfs_native.GlusterfsNativeShareDriver' $share_driver = 'manila.share.drivers.glusterfs_native.GlusterfsNativeShareDriver'

4
manifests/backend/glusternfs.pp
View File

@ -42,8 +42,8 @@ define manila::backend::glusternfs (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
$share_driver = 'manila.share.drivers.glusterfs.GlusterfsShareDriver' $share_driver = 'manila.share.drivers.glusterfs.GlusterfsShareDriver'

2
manifests/backend/hitachi_hnas.pp
View File

@ -61,7 +61,7 @@ define manila::backend::hitachi_hnas (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $hitachi_hnas_password) validate_legacy(String, 'validate_string', $hitachi_hnas_password)

2
manifests/backend/netapp.pp
View File

@ -120,7 +120,7 @@ define manila::backend::netapp (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $netapp_password) validate_legacy(String, 'validate_string', $netapp_password)

2
manifests/backends.pp
View File

@ -14,7 +14,7 @@ class manila::backends (
$enabled_share_backends = undef $enabled_share_backends = undef
) { ) {
include ::manila::deps include manila::deps
# Maybe this could be extended to dynamically find the enabled names # Maybe this could be extended to dynamically find the enabled names
manila_config { manila_config {

4
manifests/client.pp
View File

@ -11,8 +11,8 @@ class manila::client (
$package_ensure = 'present' $package_ensure = 'present'
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
package { 'python-manilaclient': package { 'python-manilaclient':
ensure => $package_ensure, ensure => $package_ensure,

2
manifests/compute/nova.pp
View File

@ -111,7 +111,7 @@ class manila::compute::nova (
$nova_admin_auth_url = undef, $nova_admin_auth_url = undef,
) { ) {
include ::manila::deps include manila::deps
if $nova_catalog_info { if $nova_catalog_info {
warning('The nova_catalog_info parameter is deprecated, has no effect and will be removed in a future release.') warning('The nova_catalog_info parameter is deprecated, has no effect and will be removed in a future release.')

2
manifests/config.pp
View File

@ -32,7 +32,7 @@ class manila::config (
$api_paste_ini_config = {}, $api_paste_ini_config = {},
) { ) {
include ::manila::deps include manila::deps
validate_legacy(Hash, 'validate_hash', $manila_config) validate_legacy(Hash, 'validate_hash', $manila_config)
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config) validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)

2
manifests/db.pp
View File

@ -62,7 +62,7 @@ class manila::db (
$database_idle_timeout = undef, $database_idle_timeout = undef,
) { ) {
include ::manila::deps include manila::deps
if $database_idle_timeout { if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \ warning('The database_idle_timeout parameter is deprecated. Please use \

2
manifests/db/mysql.pp
View File

@ -45,7 +45,7 @@ class manila::db::mysql (
$cluster_id = 'localzone', $cluster_id = 'localzone',
) { ) {
include ::manila::deps include manila::deps
validate_legacy(String, 'validate_string', $password) validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp
View File

@ -32,7 +32,7 @@ class manila::db::postgresql(
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
include ::manila::deps include manila::deps
::openstacklib::db::postgresql { 'manila': ::openstacklib::db::postgresql { 'manila':
password_hash => postgresql_password($user, $password), password_hash => postgresql_password($user, $password),

4
manifests/db/sync.pp
View File

@ -1,8 +1,8 @@
# #
class manila::db::sync { class manila::db::sync {
include ::manila::params include manila::params
include ::manila::deps include manila::deps
exec { 'manila-manage db_sync': exec { 'manila-manage db_sync':
command => $::manila::params::db_sync_command, command => $::manila::params::db_sync_command,

2
manifests/ganesha.pp
View File

@ -39,7 +39,7 @@ class manila::ganesha (
$ganesha_export_template_dir = '/etc/manila/ganesha-export-templ.d', $ganesha_export_template_dir = '/etc/manila/ganesha-export-templ.d',
) { ) {
include ::manila::deps include manila::deps
manila_config { manila_config {
'DEFAULT/ganesha_config_dir': value => $ganesha_config_dir; 'DEFAULT/ganesha_config_dir': value => $ganesha_config_dir;

6
manifests/init.pp
View File

@ -273,9 +273,9 @@ class manila (
$host = $::os_service_default, $host = $::os_service_default,
) { ) {
include ::manila::deps include manila::deps
include ::manila::db include manila::db
include ::manila::params include manila::params
if $use_ssl { if $use_ssl {
if !$cert_file { if !$cert_file {

2
manifests/keystone/auth.pp
View File

@ -131,7 +131,7 @@ class manila::keystone::auth (
$internal_url_v2 = 'http://127.0.0.1:8786/v2/%(tenant_id)s', $internal_url_v2 = 'http://127.0.0.1:8786/v2/%(tenant_id)s',
) { ) {
include ::manila::deps include manila::deps
# for interface backward compatibility, we can't enforce to set a new parameter # for interface backward compatibility, we can't enforce to set a new parameter
# so we take 'password' parameter by default but allow to override it. # so we take 'password' parameter by default but allow to override it.

2
manifests/keystone/authtoken.pp
View File

@ -214,7 +214,7 @@ class manila::keystone::authtoken(
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $::os_service_default,
) { ) {
include ::manila::deps include manila::deps
if is_service_default($password) { if is_service_default($password) {
fail('Please set password for manila service user') fail('Please set password for manila service user')

2
manifests/logging.pp
View File

@ -119,7 +119,7 @@ class manila::logging(
$log_date_format = $::os_service_default, $log_date_format = $::os_service_default,
) { ) {
include ::manila::deps include manila::deps
oslo::log { 'manila_config': oslo::log { 'manila_config':
debug => $debug, debug => $debug,

2
manifests/params.pp
View File

@ -4,7 +4,7 @@
# #
class manila::params { class manila::params {
include ::openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers $pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-manilaclient" $client_package = "python${pyvers}-manilaclient"

4
manifests/policy.pp
View File

@ -28,8 +28,8 @@ class manila::policy (
$policy_path = '/etc/manila/policy.json', $policy_path = '/etc/manila/policy.json',
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
validate_legacy(Hash, 'validate_hash', $policies) validate_legacy(Hash, 'validate_hash', $policies)

2
manifests/quota.pp
View File

@ -50,7 +50,7 @@ class manila::quota (
$max_age = 0, $max_age = 0,
) { ) {
include ::manila::deps include manila::deps
manila_config { manila_config {
'DEFAULT/quota_shares': value => $quota_shares; 'DEFAULT/quota_shares': value => $quota_shares;

2
manifests/rabbitmq.pp
View File

@ -37,7 +37,7 @@ class manila::rabbitmq(
$port = '5672', $port = '5672',
) { ) {
include ::manila::deps include manila::deps
warning('manila::rabbitmq class is deprecated and will be removed in next release. Make other plans to configure rabbitmq resources.') warning('manila::rabbitmq class is deprecated and will be removed in next release. Make other plans to configure rabbitmq resources.')

4
manifests/scheduler.pp
View File

@ -27,8 +27,8 @@ class manila::scheduler (
$manage_service = true $manage_service = true
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
Manila_config<||> ~> Service['manila-scheduler'] Manila_config<||> ~> Service['manila-scheduler']
Manila_api_paste_ini<||> ~> Service['manila-scheduler'] Manila_api_paste_ini<||> ~> Service['manila-scheduler']

2
manifests/service_instance.pp
View File

@ -104,7 +104,7 @@ define manila::service_instance (
) { ) {
include ::manila::deps include manila::deps
if $service_instance_network_helper_type { if $service_instance_network_helper_type {
warning('service_instance_network_helper_type is deprecated, has no effect, and will be removed in the future.') warning('service_instance_network_helper_type is deprecated, has no effect, and will be removed in the future.')

4
manifests/share.pp
View File

@ -21,8 +21,8 @@ class manila::share (
$manage_service = true $manage_service = true
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
Manila_config<||> ~> Service['manila-share'] Manila_config<||> ~> Service['manila-share']
Manila_api_paste_ini<||> ~> Service['manila-share'] Manila_api_paste_ini<||> ~> Service['manila-share']

4
manifests/type.pp
View File

@ -45,8 +45,8 @@ define manila::type (
$volume_name = $name $volume_name = $name
include ::manila::deps include manila::deps
include ::manila::client include manila::client
# TODO: (xarses) This should be moved to a ruby provider so that among other # TODO: (xarses) This should be moved to a ruby provider so that among other
# reasons, the credential discovery magic can occur like in neutron. # reasons, the credential discovery magic can occur like in neutron.

4
manifests/type_set.pp
View File

@ -38,8 +38,8 @@ define manila::type_set (
$os_region_name = undef, $os_region_name = undef,
) { ) {
include ::manila::deps include manila::deps
include ::manila::client include manila::client
# TODO: (xarses) This should be moved to a ruby provider so that among other # TODO: (xarses) This should be moved to a ruby provider so that among other
# reasons, the credential discovery magic can occur like in neutron. # reasons, the credential discovery magic can occur like in neutron.

2
manifests/volume/cinder.pp
View File

@ -56,7 +56,7 @@ class manila::volume::cinder (
$cinder_admin_auth_url = 'http://localhost:5000/v3', $cinder_admin_auth_url = 'http://localhost:5000/v3',
) { ) {
include ::manila::deps include manila::deps
manila_config { manila_config {
'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info; 'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info;

10
manifests/wsgi/apache.pp
View File

@ -123,12 +123,12 @@ class manila::wsgi::apache (
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
) { ) {
include ::manila::deps include manila::deps
include ::manila::params include manila::params
include ::apache include apache
include ::apache::mod::wsgi include apache::mod::wsgi
if $ssl { if $ssl {
include ::apache::mod::ssl include apache::mod::ssl
} }
::openstacklib::wsgi::apache { 'manila_wsgi': ::openstacklib::wsgi::apache { 'manila_wsgi':

36
spec/acceptance/basic_manila_spec.rb
View File

@ -6,11 +6,11 @@ describe 'basic manila' do
it 'should work with no errors' do it 'should work with no errors' do
pp= <<-EOS pp= <<-EOS
include ::openstack_integration include openstack_integration
include ::openstack_integration::repos include openstack_integration::repos
include ::openstack_integration::rabbitmq include openstack_integration::rabbitmq
include ::openstack_integration::mysql include openstack_integration::mysql
include ::openstack_integration::keystone include openstack_integration::keystone
rabbitmq_user { 'manila': rabbitmq_user { 'manila':
admin => true, admin => true,
@ -28,35 +28,35 @@ describe 'basic manila' do
} }
# Manila resources # Manila resources
class { '::manila::logging': class { 'manila::logging':
debug => true, debug => true,
} }
class { '::manila': class { 'manila':
default_transport_url => 'rabbit://manila:an_even_bigger_secret@127.0.0.1:5672/', default_transport_url => 'rabbit://manila:an_even_bigger_secret@127.0.0.1:5672/',
sql_connection => 'mysql+pymysql://manila:a_big_secret@127.0.0.1/manila?charset=utf8', sql_connection => 'mysql+pymysql://manila:a_big_secret@127.0.0.1/manila?charset=utf8',
} }
class { '::manila::db::mysql': class { 'manila::db::mysql':
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::manila::keystone::auth': class { 'manila::keystone::auth':
password => 'a_big_secret', password => 'a_big_secret',
password_v2 => 'a_big_secret', password_v2 => 'a_big_secret',
} }
class { '::manila::client': } class { 'manila::client': }
class { '::manila::compute::nova': } class { 'manila::compute::nova': }
class { '::manila::network::neutron': } class { 'manila::network::neutron': }
class { '::manila::volume::cinder': } class { 'manila::volume::cinder': }
class { '::manila::keystone::authtoken': class { 'manila::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::manila::api': class { 'manila::api':
service_name => 'httpd', service_name => 'httpd',
} }
include ::apache include apache
class { '::manila::wsgi::apache': class { 'manila::wsgi::apache':
ssl => false, ssl => false,
} }
class { '::manila::scheduler': } class { 'manila::scheduler': }
# missing: backends, share, service_instance # missing: backends, share, service_instance
EOS EOS

8
spec/classes/manila_api_spec.rb
View File

@ -153,9 +153,9 @@ describe 'manila::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
class { 'manila': } class { 'manila': }
class { '::manila::keystone::authtoken': class { 'manila::keystone::authtoken':
password => 'foo', password => 'foo',
}" }"
end end
@ -175,9 +175,9 @@ describe 'manila::api' do
end end
let :pre_condition do let :pre_condition do
"include ::apache "include apache
class { 'manila': } class { 'manila': }
class { '::manila::keystone::authtoken': class { 'manila::keystone::authtoken':
password => 'foo', password => 'foo',
}" }"
end end