diff --git a/examples/manifests/site.pp b/examples/manifests/site.pp
index fb29bf0d1ea2a73539d7661067c61cc0dc455732..3f7764d116f7ba406dc05d63f645f765a0298dbd 100644
--- a/examples/manifests/site.pp
+++ b/examples/manifests/site.pp
@@ -1,5 +1,5 @@
-## ZABBIX
-#  zabbix node variables
+## t_hostname         => $hostname,ZABBIX
+#a zabbix node variables
 $zabbix_server_ip = '192.168.0.11'
 $zabbix_versione  = '2.4'
 $zabbix_install   = true
@@ -19,6 +19,7 @@ $haproxy_stats_login	= "stats"
 $haproxy_stats_password	= "stats"
 $haproxy_stats_uri	= "/"
 $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
+$rabbit_package_gpg_key = "https://www.rabbitmq.com/rabbitmq-release-signing-key.asc"
 
 #node '<RHMK_HOSTNAME1>' {
 #  include 'iaas::params'
@@ -40,6 +41,7 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #	haproxy_stats_uri	=> $haproxy_stats_uri,
 #	rabbit_erlang		=> $rabbit_erlang,
 #       rabbit_hostname 	=> $hostname,
+#	rabbit_package_gpg_key  => $rabbit_package_gpg_key,
 ##set zookeeper index (1,..,N)
 #       zookeeper_id => '1',
 #  }
@@ -68,6 +70,7 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #	haproxy_stats_uri	=> $haproxy_stats_uri,
 #	rabbit_erlang		=> $rabbit_erlang,
 #       rabbit_hostname 	=> $hostname,
+#	rabbit_package_gpg_key  => $rabbit_package_gpg_key,
 ##set zookeeper index (1,..,N)
 #       zookeeper_id => '2',
 #  }
@@ -96,6 +99,7 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #	haproxy_stats_uri	=> $haproxy_stats_uri,
 #	rabbit_erlang		=> $rabbit_erlang,
 #       rabbit_hostname 	=> $hostname,
+#	rabbit_package_gpg_key  => $rabbit_package_gpg_key,
 ##set zookeeper index (1,..,N)
 #       zookeeper_id => '3',
 #  }
@@ -162,8 +166,6 @@ $ceph_mon_key           = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
 #	os_admin_tenant        => 'admin',
 #	os_tenants  		=> {'test'=> { description => 'OCP in HA'}},
 #	os_users    		=> {'guest' => {password => 'pippo', tenant => 'test', email => 'alessandro.costantini@cnaf.infn.it' }},
-#	##Cinder - override
-#	cinder_volsize => '8G',
 #	##Neutron networks - override
 #	#Network1
 #	neutron_ext1_network 	=> '10.10.98.0/24',
diff --git a/manifests/profile/cinder.pp b/manifests/profile/cinder.pp
index 1ad4d31959283563ad1300ae5126af5dbbc5cf8c..84586864c3a5b11dc1eea10da978888c93ee2255 100644
--- a/manifests/profile/cinder.pp
+++ b/manifests/profile/cinder.pp
@@ -3,7 +3,6 @@ class iaas::profile::cinder (
 #Cinder
   $password = undef,
   $secret = undef,
-  $volume_size = undef,
 
 ##verbose, debug
   $verbose = false,
@@ -76,11 +75,6 @@ class iaas::profile::cinder (
     scheduler_driver => 'cinder.scheduler.filter_scheduler.FilterScheduler',
   }
 
-#  class { '::cinder::setup_test_volume':
-#    volume_name => 'cinder-volumes',
-#    size => $volume_size
-#  } ->
-
   class { '::cinder::volume': }
 
   class { '::cinder::volume::rbd':
diff --git a/manifests/role/controller.pp b/manifests/role/controller.pp
index 03a017ac837df523919427aaf8d82e1c2b57eec7..247fc5954849cc460417061951d462ec96125daf 100644
--- a/manifests/role/controller.pp
+++ b/manifests/role/controller.pp
@@ -30,9 +30,6 @@ $os_admin_tenant 	= 'admin',
 $os_tenants  =  {'test'=> { description => 'OCP in HA'}},
 $os_users    =  {'guest' => {password => 'pippo', tenant => 'test', email => 'alessandro.costantini@cnaf.infn.it' }},
 
-##Cinder - override
-$cinder_volsize = '8G',
-
 ##Neutron networks - override
 #Network1
 $neutron_ext1_network = '10.10.98.0/24',
@@ -135,7 +132,6 @@ $neutron_ext2_ipend   = undef,
   class { 'iaas::profile::cinder': 
         password                => $iaas::params::os_cinder_passwd,
         secret                  => $iaas::params::os_cinder_secret,
-        volume_size             => $cinder_volsize,
         public_interface        => $iaas::params::public_interface,
         admin_interface         => $iaas::params::admin_interface,
         verbose                 => $iaas::params::os_verbose,
diff --git a/manifests/role/controllerandnetwork.pp b/manifests/role/controllerandnetwork.pp
index 4127c1a0777c2fec652da5bb1dcd1ad87aa34534..aa873f4444ee84204941e7310472241e85c0aa22 100644
--- a/manifests/role/controllerandnetwork.pp
+++ b/manifests/role/controllerandnetwork.pp
@@ -30,9 +30,6 @@ $os_admin_tenant 	= 'admin',
 $os_tenants  =  {'test'=> { description => 'OCP in HA'}},
 $os_users    =  {'guest' => {password => 'pippo', tenant => 'test', email => 'alessandro.costantini@cnaf.infn.it' }},
 
-##Cinder - override
-$cinder_volsize = '8G',
-
 ##Neutron networks - override
 #Network1
 $neutron_ext1_network = '10.10.98.0/24',
@@ -141,7 +138,6 @@ $mtu = '1438',
   class { 'iaas::profile::cinder': 
         password                => $iaas::params::os_cinder_passwd,
         secret                  => $iaas::params::os_cinder_secret,
-        volume_size             => $cinder_volsize,
         public_interface        => $iaas::params::public_interface,
         admin_interface         => $iaas::params::admin_interface,
         verbose                 => $iaas::params::os_verbose,