Merge "Deprecate drivers in Cinder.conf DEFAULT section."

manifests/volume/dellsc_iscsi.pp

@@ -58,6 +58,10 @@ class cinder::volume::dellsc_iscsi (
   $iscsi_port            = $::os_service_default,
   $extra_options         = {},
 ) {
+
+  warning('Usage of cinder::volume::dellsc_iscsi is deprecated, please use
+cinder::backend::dellsc_iscsi instead.')
+
   cinder::backend::dellsc_iscsi { 'DEFAULT':
     san_ip                => $san_ip,
     san_login             => $san_login,

manifests/volume/emc_vnx.pp

@@ -78,6 +78,9 @@ class cinder::volume::emc_vnx(
   $naviseccli_path               = $::os_service_default,
 ) {
 
+  warning('Usage of cinder::volume::emc_vnx is deprecated, please use
+cinder::backend::emc_vnx instead.')
+
   cinder::backend::emc_vnx { 'DEFAULT':
     default_timeout               => $default_timeout,
     iscsi_ip_address              => $iscsi_ip_address,

manifests/volume/eqlx.pp

@@ -88,6 +88,9 @@ class cinder::volume::eqlx (
   $eqlx_cli_timeout     = undef,
 ) {
 
+  warning('Usage of cinder::volume::eqlx is deprecated, please use
+cinder::backend::eqlx instead.')
+
   if $eqlx_chap_login {
     warning('eqlx_chap_login is deprecated and will be removed after Newton cycle. Please use chap_username instead.')
     $chap_username_real = $eqlx_chap_login

manifests/volume/glusterfs.pp

@@ -52,6 +52,9 @@ class cinder::volume::glusterfs (
   $extra_options                = {},
 ) {
 
+  warning('Usage of cinder::volume::glusterfs is deprecated, please use
+cinder::backend::glusterfs instead.')
+
   cinder::backend::glusterfs { 'DEFAULT':
     glusterfs_shares             => $glusterfs_shares,
     glusterfs_backup_mount_point => $glusterfs_backup_mount_point,

manifests/volume/gpfs.pp

@@ -67,6 +67,10 @@ class cinder::volume::gpfs(
   $gpfs_storage_pool      = $::os_service_default,
   $extra_options          = {}
 ) {
+
+  warning('Usage of cinder::volume::gpfs is deprecated, please use
+cinder::backend::gpfs instead.')
+
   cinder::backend::gpfs { 'DEFAULT':
     gpfs_mount_point_base  => $gpfs_mount_point_base,
     gpfs_images_dir        => $gpfs_images_dir,

manifests/volume/hp3par_iscsi.pp

@@ -64,7 +64,6 @@ class cinder::volume::hp3par_iscsi(
   $extra_options              = {},
 ) {
 
-
   warning('The class cinder::volume::hp3par_iscsi is deprecated and will be removed after Newton cycle, pleasse use the new class cinder::volume::hpe3par_iscsi.')
 
   cinder::backend::hpe3par_iscsi { 'DEFAULT':

manifests/volume/hpe3par_iscsi.pp

@@ -66,6 +66,9 @@ class cinder::volume::hpe3par_iscsi(
   $extra_options               = {},
 ) {
 
+  warning('Usage of cinder::volume::hpe3par_iscsi is deprecated, please use
+cinder::backend::hpe3par_iscsi instead.')
+
   cinder::backend::hpe3par_iscsi { 'DEFAULT':
     volume_driver               => $volume_driver,
     hpe3par_username            => $hpe3par_username,

manifests/volume/iscsi.pp

@@ -45,6 +45,9 @@ class cinder::volume::iscsi (
 
   include ::cinder::params
 
+  warning('Usage of cinder::volume::iscsi is deprecated, please use
+cinder::backend::iscsi instead.')
+
   cinder::backend::iscsi { 'DEFAULT':
     iscsi_ip_address => $iscsi_ip_address,
     volume_driver    => $volume_driver,

manifests/volume/netapp.pp

@@ -217,6 +217,9 @@ class cinder::volume::netapp (
     $netapp_host_type_real = $netapp_host_type
   }
 
+  warning('Usage of cinder::volume::netapp is deprecated, please use
+cinder::backend::netapp instead.')
+
   cinder::backend::netapp { 'DEFAULT':
     netapp_login                 => $netapp_login,
     netapp_password              => $netapp_password,

manifests/volume/nexenta.pp

@@ -46,6 +46,9 @@ class cinder::volume::nexenta (
   $extra_options                = {},
 ) {
 
+  warning('Usage of cinder::volume::nexenta is deprecated, please use
+cinder::backend::nexenta instead.')
+
   cinder::backend::nexenta { 'DEFAULT':
     nexenta_user                => $nexenta_user,
     nexenta_password            => $nexenta_password,

manifests/volume/nfs.pp

@@ -65,6 +65,9 @@ class cinder::volume::nfs (
   $extra_options        = {},
 ) {
 
+  warning('Usage of cinder::volume::nfs is deprecated, please use
+cinder::backend::nfs instead.')
+
   cinder::backend::nfs { 'DEFAULT':
     nfs_servers          => $nfs_servers,
     nfs_mount_attempts   => $nfs_mount_attempts,

manifests/volume/pure.pp

@@ -44,6 +44,9 @@ class cinder::volume::pure(
   $extra_options                = {},
 ) {
 
+  warning('Usage of cinder::volume::pure is deprecated, please use
+cinder::backend::pure instead.')
+
   cinder::backend::pure { 'DEFAULT':
     san_ip                       => $san_ip,
     pure_api_token               => $pure_api_token,

manifests/volume/quobyte.pp

@@ -44,6 +44,9 @@ class cinder::volume::quobyte (
   $quobyte_mount_point_base = undef,
 ) {
 
+  warning('Usage of cinder::volume::quobyte is deprecated, please use
+cinder::backend::quobyte instead.')
+
   cinder::backend::quobyte { 'DEFAULT':
     quobyte_volume_url       => $quobyte_volume_url,
     quobyte_client_cfg       => $quobyte_client_cfg,

manifests/volume/rbd.pp

@@ -75,6 +75,9 @@ class cinder::volume::rbd (
   $volume_tmp_dir                   = false,
 ) {
 
+  warning('Usage of cinder::volume::rbd is deprecated, please use
+cinder::backend::rbd instead.')
+
   cinder::backend::rbd { 'DEFAULT':
     rbd_pool                         => $rbd_pool,
     rbd_user                         => $rbd_user,

manifests/volume/san.pp

@@ -71,6 +71,9 @@ class cinder::volume::san (
   $extra_options      = {},
 ) {
 
+  warning('Usage of cinder::volume::san is deprecated, please use
+cinder::backend::san instead.')
+
   cinder::backend::san { 'DEFAULT':
     volume_driver      => $volume_driver,
     san_thin_provision => $san_thin_provision,

manifests/volume/solidfire.pp

@@ -65,6 +65,9 @@ class cinder::volume::solidfire(
   $extra_options             = {},
 ) {
 
+  warning('Usage of cinder::volume::solidfire is deprecated, please use
+cinder::backend::solidfire instead.')
+
   cinder::backend::solidfire { 'DEFAULT':
     san_ip                    => $san_ip,
     san_login                 => $san_login,

manifests/volume/vmdk.pp

@@ -64,6 +64,9 @@ class cinder::volume::vmdk(
   $extra_options               = {},
 ) {
 
+  warning('Usage of cinder::volume::vmdk is deprecated, please use
+cinder::backend::vmdk instead.')
+
   cinder::backend::vmdk { 'DEFAULT':
     host_ip                     => $host_ip,
     host_username               => $host_username,

releasenotes/notes/deprecate-drivers-in-default-f4a7c69ea9415375.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - Support for drivers in the Cinder.conf DEFAULT section is deprecated
+    and will be removed after the Newton release. Please update your puppet
+    implementations to use cinder\:\:backend instead.