diff --git a/manifests/api.pp b/manifests/api.pp
index bd985e42..b097eb63 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -195,8 +195,8 @@ class cinder::api (
   include ::cinder::params
   include ::cinder::policy
 
-  validate_bool($manage_service)
-  validate_bool($enabled)
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
 
   $deprecated_param_names = [
     'nova_catalog_info',
diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp
index 301cf2ef..eecbd084 100644
--- a/manifests/backend/netapp.pp
+++ b/manifests/backend/netapp.pp
@@ -236,7 +236,8 @@ define cinder::backend::netapp (
   include ::cinder::deps
 
   if $nfs_shares {
-    validate_array($nfs_shares)
+    validate_legacy(Array, 'validate_array', $nfs_shares)
+
     file {$nfs_shares_config:
       content => join($nfs_shares, "\n"),
       require => Anchor['cinder::install::end'],
diff --git a/manifests/backup.pp b/manifests/backup.pp
index e8a91895..e64d9c46 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -60,8 +60,8 @@ class cinder::backup (
   include ::cinder::deps
   include ::cinder::params
 
-  validate_bool($manage_service)
-  validate_bool($enabled)
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
 
   if $::cinder::params::backup_package {
     package { 'cinder-backup':
diff --git a/manifests/backup/nfs.pp b/manifests/backup/nfs.pp
index 1abdb36e..7f295144 100644
--- a/manifests/backup/nfs.pp
+++ b/manifests/backup/nfs.pp
@@ -81,7 +81,8 @@ class cinder::backup::nfs (
 ) {
 
   include ::cinder::deps
-  validate_string($backup_share)
+
+  validate_legacy(String, 'validate_string', $backup_share)
 
   cinder_config {
     'DEFAULT/backup_mount_options':         value => $backup_mount_options;
diff --git a/manifests/config.pp b/manifests/config.pp
index db8b4ef3..66261ae8 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -35,8 +35,8 @@ class cinder::config (
 
   include ::cinder::deps
 
-  validate_hash($cinder_config)
-  validate_hash($api_paste_ini_config)
+  validate_legacy(Hash, 'validate_hash', $cinder_config)
+  validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)
 
   create_resources('cinder_config', $cinder_config)
   create_resources('cinder_api_paste_ini', $api_paste_ini_config)
diff --git a/manifests/db.pp b/manifests/db.pp
index 055ed381..4488701e 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -66,8 +66,8 @@ class cinder::db (
   $database_retry_interval_real = pick($::cinder::database_retry_interval,$database_retry_interval)
   $database_max_overflow_real   = pick($::cinder::database_max_overflow,$database_max_overflow)
 
-  validate_re($database_connection_real,
-    '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
+  validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
+    ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
   oslo::db { 'cinder_config':
     db_max_retries => $database_db_max_retries,
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index dcc4d164..edb580e9 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -44,7 +44,7 @@ class cinder::db::mysql (
 
   include ::cinder::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::mysql { 'cinder':
     user          => $user,
diff --git a/manifests/policy.pp b/manifests/policy.pp
index baca6c31..6e7984e4 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -31,7 +31,7 @@ class cinder::policy (
   include ::cinder::deps
   include ::cinder::params
 
-  validate_hash($policies)
+  validate_legacy(Hash, 'validate_hash', $policies)
 
   Openstacklib::Policy::Base {
     file_path  => $policy_path,
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index 2fab88ed..8e1513aa 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -31,8 +31,8 @@ class cinder::scheduler (
   include ::cinder::deps
   include ::cinder::params
 
-  validate_bool($manage_service)
-  validate_bool($enabled)
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
 
   cinder_config { 'DEFAULT/scheduler_driver': value => $scheduler_driver; }
 
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 1a850c47..0cf43c9e 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -46,8 +46,8 @@ class cinder::volume (
   include ::cinder::deps
   include ::cinder::params
 
-  validate_bool($manage_service)
-  validate_bool($enabled)
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
 
   if $::cinder::params::volume_package {
     package { 'cinder-volume':
diff --git a/spec/defines/cinder_backend_netapp_spec.rb b/spec/defines/cinder_backend_netapp_spec.rb
index dcbb8185..77f9f5ca 100644
--- a/spec/defines/cinder_backend_netapp_spec.rb
+++ b/spec/defines/cinder_backend_netapp_spec.rb
@@ -124,7 +124,7 @@ describe 'cinder::backend::netapp' do
         })
       end
 
-      it { should raise_error(Puppet::Error, /"not an array" is not an Array.  It looks to be a String/) }
+      it { should raise_error(Puppet::Error) }
     end
 
     context 'with name search pattern' do