openstack/puppet-cinder
Code Issues Proposed changes

Convert all class usage to relative names

Browse Source 
Change-Id: Ib509c510e3e5ed19fbb1b5f68a060cde02d82eab
This commit is contained in:
Tobias Urdin 2019-12-08 23:02:56 +01:00
parent 3e999fd104
commit 1e1be4fb56
65 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/cinder_volume_with_pacemaker.pp
View File

@ -21,18 +21,18 @@
#
# sudo pcs constraint colocation add cinder_api_service with cinder_vip
class { '::cinder':
class { 'cinder':
database_connection => 'mysql://cinder:secret_block_password@openstack-controller.example.com/cinder',
}
class { '::cinder::api':
class { 'cinder::api':
keystone_password => 'CINDER_PW',
keystone_user => 'cinder',
enabled => false,
manage_service => false,
}
class { '::cinder::scheduler':
class { 'cinder::scheduler':
enabled => false,
manage_service => false,
}

12
manifests/api.pp
View File

@ -155,9 +155,9 @@ class cinder::api (
$keymgr_backend = $::os_service_default,
) inherits cinder::params {
include ::cinder::deps
include ::cinder::params
include ::cinder::policy
include cinder::deps
include cinder::params
include cinder::policy
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
@ -180,7 +180,7 @@ class cinder::api (
}
if $sync_db {
include ::cinder::db::sync
include cinder::db::sync
}
if $enabled {
@ -203,7 +203,7 @@ class cinder::api (
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'cinder-api':
ensure => 'stopped',
name => $::cinder::params::api_service,
@ -243,7 +243,7 @@ running as a standalone service, or httpd for being run by a httpd server")
}
if $auth_strategy == 'keystone' {
include ::cinder::keystone::authtoken
include cinder::keystone::authtoken
}
# SSL Options

2
manifests/backend/dellemc_unity.pp
View File

@ -60,7 +60,7 @@ define cinder::backend::dellemc_unity (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
$driver = 'dell_emc.unity.Driver'
cinder_config {

2
manifests/backend/dellemc_vmax_iscsi.pp
View File

@ -44,7 +44,7 @@ define cinder::backend::dellemc_vmax_iscsi (
$manage_volume_type = false,
) {
include ::cinder::deps
include cinder::deps
cinder_config {

2
manifests/backend/dellemc_xtremio_iscsi.pp
View File

@ -64,7 +64,7 @@ define cinder::backend::dellemc_xtremio_iscsi (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
$driver = 'dell_emc.xtremio.XtremIOISCSIDriver'
cinder_config {

2
manifests/backend/dellsc_iscsi.pp
View File

@ -110,7 +110,7 @@ define cinder::backend::dellsc_iscsi (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
if $dell_sc_server_folder == 'srv' {
warning("The OpenStack default value of dell_sc_server_folder differs from the puppet module \

4
manifests/backend/emc_vnx.pp
View File

@ -99,8 +99,8 @@ define cinder::backend::emc_vnx (
$manage_volume_type = false,
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
cinder_config {
"${name}/default_timeout": value => $default_timeout;

2
manifests/backend/eqlx.pp
View File

@ -90,7 +90,7 @@ define cinder::backend::eqlx (
$manage_volume_type = false,
) {
include ::cinder::deps
include cinder::deps
if is_service_default($chap_username) {
fail('chap_username need to be set.')

2
manifests/backend/glusterfs.pp
View File

@ -72,7 +72,7 @@ define cinder::backend::glusterfs (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
$content = join($glusterfs_shares, "\n")

2
manifests/backend/gpfs.pp
View File

@ -107,7 +107,7 @@ define cinder::backend::gpfs (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
if ! ($gpfs_images_share_mode in ['copy', 'copy_on_write', $::os_service_default]) {
fail('gpfs_images_share_mode only support `copy` or `copy_on_write`')

2
manifests/backend/hpe3par_iscsi.pp
View File

@ -91,7 +91,7 @@ define cinder::backend::hpe3par_iscsi(
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
if ($hpe3par_snapshot_expiration <= $hpe3par_snapshot_retention) {
fail ('hpe3par_snapshot_expiration must be greater than hpe3par_snapshot_retention')

2
manifests/backend/hpelefthand_iscsi.pp
View File

@ -61,7 +61,7 @@ define cinder::backend::hpelefthand_iscsi(
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

4
manifests/backend/iscsi.pp
View File

@ -62,8 +62,8 @@ define cinder::backend::iscsi (
$extra_options = {},
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
# NOTE(mnaser): Cinder requires /usr/sbin/thin_check to create volumes which
# does not get installed with Cinder (see LP#1615134).

2
manifests/backend/netapp.pp
View File

@ -233,7 +233,7 @@ define cinder::backend::netapp (
$nas_secure_file_permissions = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
if $nfs_shares {
validate_legacy(Array, 'validate_array', $nfs_shares)

2
manifests/backend/nexenta.pp
View File

@ -80,7 +80,7 @@ define cinder::backend::nexenta (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

2
manifests/backend/nfs.pp
View File

@ -113,7 +113,7 @@ define cinder::backend::nfs (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
file {$nfs_shares_config:
content => join($nfs_servers, "\n"),

4
manifests/backend/nvmeof.pp
View File

@ -59,8 +59,8 @@ define cinder::backend::nvmeof (
$volume_group = $::os_service_default,
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
cinder_config {
"${name}/target_ip_address": value => $target_ip_address;

2
manifests/backend/pure.pp
View File

@ -64,7 +64,7 @@ define cinder::backend::pure(
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
$volume_driver = $pure_storage_protocol ? {
'FC' => 'cinder.volume.drivers.pure.PureFCDriver',

2
manifests/backend/quobyte.pp
View File

@ -63,7 +63,7 @@ define cinder::backend::quobyte (
$manage_volume_type = false,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

4
manifests/backend/rbd.pp
View File

@ -93,8 +93,8 @@ define cinder::backend::rbd (
$extra_options = {},
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
$rbd_cluster_name = basename($rbd_ceph_conf, '.conf')
if $rbd_cluster_name == 'ceph' {

2
manifests/backend/san.pp
View File

@ -87,7 +87,7 @@ define cinder::backend::san (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

2
manifests/backend/solidfire.pp
View File

@ -112,7 +112,7 @@ define cinder::backend::solidfire(
$sf_enable_volume_mapping = undef,
) {
include ::cinder::deps
include cinder::deps
if $sf_enable_volume_mapping {
warning('The sf_enable_volume_mapping parameter is deprecated, has no effect and will be removed in the future release.')

2
manifests/backend/veritas_hyperscale.pp
View File

@ -42,7 +42,7 @@ define cinder::backend::veritas_hyperscale (
$manage_volume_type = false,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

2
manifests/backend/vmdk.pp
View File

@ -83,7 +83,7 @@ define cinder::backend::vmdk (
$extra_options = {},
) {
include ::cinder::deps
include cinder::deps
if $volume_folder == 'cinder-volumes' {
warning("The OpenStack default value of volume_folder differs from the puppet module \

2
manifests/backend/vstorage.pp
View File

@ -79,7 +79,7 @@ define cinder::backend::vstorage (
$manage_package = true,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;

2
manifests/backends.pp
View File

@ -20,7 +20,7 @@ class cinder::backends (
$backend_host = hiera('cinder::backend_host', undef)
) {
include ::cinder::deps
include cinder::deps
if $enabled_backends == undef {
warning("Configurations that are setting backend config in ``[DEFAULT]`` \

4
manifests/backup.pp
View File

@ -57,8 +57,8 @@ class cinder::backup (
$backup_name_template = $::os_service_default,
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)

2
manifests/backup/ceph.pp
View File

@ -67,7 +67,7 @@ class cinder::backup::ceph (
$backup_ceph_stripe_count = '0'
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/backup/glusterfs.pp
View File

@ -44,7 +44,7 @@ class cinder::backup::glusterfs (
$glusterfs_backup_share = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/backup/google.pp
View File

@ -103,7 +103,7 @@ class cinder::backup::google (
$backup_gcs_enable_progress_timer = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/backup/nfs.pp
View File

@ -80,7 +80,7 @@ class cinder::backup::nfs (
$backup_compression_algorithm = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
validate_legacy(String, 'validate_string', $backup_share)

2
manifests/backup/posix.pp
View File

@ -63,7 +63,7 @@ class cinder::backup::posix (
$backup_container = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/backup/swift.pp
View File

@ -88,7 +88,7 @@ class cinder::backup::swift (
$backup_compression_algorithm = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/backup/tsm.pp
View File

@ -48,7 +48,7 @@ class cinder::backup::tsm (
$backup_tsm_compression = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;

2
manifests/ceilometer.pp
View File

@ -24,7 +24,7 @@ class cinder::ceilometer (
$notification_topics = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
oslo::messaging::notifications { 'cinder_config':
transport_url => $notification_transport_url,

4
manifests/client.pp
View File

@ -12,8 +12,8 @@ class cinder::client(
$package_ensure = 'present'
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
package { 'python-cinderclient':
ensure => $package_ensure,

2
manifests/config.pp
View File

@ -33,7 +33,7 @@ class cinder::config (
$api_paste_ini_config = {},
) {
include ::cinder::deps
include cinder::deps
validate_legacy(Hash, 'validate_hash', $cinder_config)
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)

2
manifests/coordination.pp
View File

@ -12,7 +12,7 @@ class cinder::coordination (
$backend_url = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'coordination/backend_url': value => $backend_url;

2
manifests/cron/db_purge.pp
View File

@ -69,7 +69,7 @@ class cinder::cron::db_purge (
$maxdelay = 0
) {
include ::cinder::deps
include cinder::deps
if $maxdelay == 0 {
$sleep = ''

2
manifests/db.pp
View File

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

2
manifests/db/mysql.pp
View File

@ -42,7 +42,7 @@ class cinder::db::mysql (
$collate = 'utf8_general_ci',
) {
include ::cinder::deps
include cinder::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp
View File

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

2
manifests/db/sync.pp
View File

@ -13,7 +13,7 @@ class cinder::db::sync(
$extra_params = undef,
) {
include ::cinder::deps
include cinder::deps
exec { 'cinder-manage db_sync':
command => "cinder-manage ${extra_params} db sync",

2
manifests/glance.pp
View File

@ -57,7 +57,7 @@ class cinder::glance (
$glance_request_timeout = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/glance_api_servers': value => join(any2array($glance_api_servers), ',');

4
manifests/init.pp
View File

@ -305,8 +305,8 @@ class cinder (
$backend_host = $::os_service_default,
) inherits cinder::params {
include ::cinder::deps
include ::cinder::db
include cinder::deps
include cinder::db
package { 'cinder':
ensure => $package_ensure,

2
manifests/keystone/auth.pp
View File

@ -200,7 +200,7 @@ class cinder::keystone::auth (
$region = 'RegionOne',
) {
include ::cinder::deps
include cinder::deps
if $configure_endpoint_v2 {
Keystone_endpoint["${region}/${service_name_v2}::${service_type_v2}"] -> Anchor['cinder::service::end']

2
manifests/keystone/authtoken.pp
View File

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

2
manifests/keystone/service_user.pp
View File

@ -80,7 +80,7 @@ class cinder::keystone::service_user(
$region_name = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
keystone::resource::service_user { 'cinder_config':
username => $username,

2
manifests/logging.pp
View File

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

2
manifests/nova.pp
View File

@ -100,7 +100,7 @@ class cinder::nova (
$project_domain_name = 'Default',
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'nova/region_name': value => $region_name;

2
manifests/params.pp
View File

@ -3,7 +3,7 @@
# Parameters for puppet-cinder
#
class cinder::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-cinderclient"

4
manifests/policy.pp
View File

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

2
manifests/qos.pp
View File

@ -22,7 +22,7 @@ define cinder::qos (
$properties = undef,
) {
include ::cinder::deps
include cinder::deps
cinder_qos { $name:
ensure => present,

2
manifests/quota.pp
View File

@ -28,7 +28,7 @@ class cinder::quota (
$quota_driver = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
cinder_config {
'DEFAULT/quota_volumes': value => $quota_volumes;

2
manifests/quota_set.pp
View File

@ -58,7 +58,7 @@ define cinder::quota_set (
$volume_type = $name,
) {
include ::cinder::deps
include cinder::deps
if $os_region_name {
$cinder_env = [

4
manifests/scheduler.pp
View File

@ -28,8 +28,8 @@ class cinder::scheduler (
$manage_service = true
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)

2
manifests/scheduler/filter.pp
View File

@ -12,7 +12,7 @@ class cinder::scheduler::filter (
$scheduler_default_filters = $::os_service_default,
) {
include ::cinder::deps
include cinder::deps
if (!is_service_default($scheduler_default_filters)) {
cinder_config {

2
manifests/setup_test_volume.pp
View File

@ -22,7 +22,7 @@ class cinder::setup_test_volume(
$loopback_device = '/dev/loop2'
) {
include ::cinder::deps
include cinder::deps
package { 'lvm2':
ensure => present,

2
manifests/type.pp
View File

@ -22,7 +22,7 @@ define cinder::type (
$set_value = undef,
) {
include ::cinder::deps
include cinder::deps
warning('The cinder::type is deprecated, please use the cinder_type resource.')

2
manifests/type_set.pp
View File

@ -22,7 +22,7 @@ define cinder::type_set (
$value = $name,
) {
include ::cinder::deps
include cinder::deps
warning('The cinder::type_set class is deprecated, please use the cinder_type resource instead.')

2
manifests/vmware.pp
View File

@ -4,7 +4,7 @@
#
class cinder::vmware {
include ::cinder::deps
include cinder::deps
cinder_type { 'vmware-thin':
ensure => present,

4
manifests/volume.pp
View File

@ -43,8 +43,8 @@ class cinder::volume (
$volume_clear_ionice = $::os_service_default,
) {
include ::cinder::deps
include ::cinder::params
include cinder::deps
include cinder::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)

10
manifests/wsgi/apache.pp
View File

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

12
spec/acceptance/basic_cinder_spec.rb
View File

@ -6,12 +6,12 @@ describe 'basic cinder' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::cinder
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::cinder
EOS

10
spec/classes/cinder_api_spec.rb
View File

@ -3,7 +3,7 @@ require 'spec_helper'
describe 'cinder::api' do
shared_examples 'cinder api' do
let :pre_condition do
"class { '::cinder::keystone::authtoken':
"class { 'cinder::keystone::authtoken':
password => 'foo',
}"
end
@ -181,9 +181,9 @@ describe 'cinder::api' do
end
let :pre_condition do
"include ::apache
"include apache
class { 'cinder': }
class { '::cinder::keystone::authtoken':
class { 'cinder::keystone::authtoken':
password => 'foo',
}"
end
@ -203,9 +203,9 @@ describe 'cinder::api' do
end
let :pre_condition do
"include ::apache
"include apache
class { 'cinder': }
class { '::cinder::keystone::authtoken':
class { 'cinder::keystone::authtoken':
password => 'foo',
}"
end