refactored cinder secrets and fixed $ syntax error in some variables

examples/manifests/site.pp

@@ -104,24 +104,32 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 
 ## CEPH STORAGE NODES
 
+$ceph_secret_admin      = 'AQDgL/hUSC2kLBAAnWJaSiqJG+YMk+XV9sapnw=='
+$ceph_secret_bootstrap  = 'AQDlL/hUUCpdFBAAZeo6mKj4yeKPmVKfUY5awA=='
+$ceph_secret_glance     = 'AQBgGdJUCPwjLRAARZ0KEaxewYcYHT3j5Gl5Cg=='
+$ceph_secret_cinder     = 'AQAvxQpVKJ03KxAADFv78tedrAWZx1SoRdsQUA=='
+$ceph_secret_cinderbkup = 'AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q=='
+$ceph_bootstrap_mdskey  = 'AQBxkvVU4F+VDBAArxUf+8s0LbxIxNrbyEC1kw=='
+$ceph_mon_key           = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
+
 #node '<storage_hostname>' {
 #
 #  include 'iaas::params'
 #  include 'iaas::role::iaasbase'
 #  class {'iaas::role::storage':
-#	$ceph_secret_admin	=> 'AQDgL/hUSC2kLBAAnWJaSiqJG+YMk+XV9sapnw==',
-#	$ceph_secret_bootstrap  => 'AQDlL/hUUCpdFBAAZeo6mKj4yeKPmVKfUY5awA==',
-#	$ceph_secret_glance     => 'AQBgGdJUCPwjLRAARZ0KEaxewYcYHT3j5Gl5Cg==',
-#	$ceph_secret_cinder     => 'AQAvxQpVKJ03KxAADFv78tedrAWZx1SoRdsQUA==',
-#	$ceph_secret_cinderbkup => 'AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==',
-#	$ceph_bootstrap_mdskey  => 'AQBxkvVU4F+VDBAArxUf+8s0LbxIxNrbyEC1kw==',
-#	$ceph_mon_key           => 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw==',
-#	$osd_configure          => true,
-#	$ceph_pool =  { 'images'  => { pg_num => '128'},
+#	ceph_secret_admin	=> $ceph_secret_admin,
+#	ceph_secret_bootstrap 	=> $ceph_secret_bootstrap, 
+#	ceph_secret_glance     	=> $ceph_secret_glance,
+#	ceph_secret_cinder     	=> $ceph_secret_cinder,
+#	ceph_secret_cinderbkup 	=> $ceph_secret_cinderbkup,
+#	ceph_bootstrap_mdskey  	=> $ceph_bootstrap_mdskey,
+#	ceph_mon_key           	=> $ceph_mon_key,
+#	osd_configure          	=> true,
+#	ceph_pool =>  { 'images'  => { pg_num => '128'},
 #               	'volumes' => { pg_num => '128'},
 #               	'vms'     => { pg_num => '128'},
 #               	'backups' => { pg_num => '128'}},
-#	$ceph_osd  =  { '/dev/vdb'=> { journal => '/osd1'},    
+#	ceph_osd  =>  { '/dev/vdb'=> { journal => '/osd1'},    
 #               	'/dev/vdc'=> { journal => '/osd2'}},
 #  }
 #  if $zabbix_install {
@@ -138,30 +146,30 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #  include 'iaas::params'
 #  include 'iaas::role::iaasbase'
 #  class {'iaas::role::controller':
-#	$ceph_secret_glance     => 'AQBgGdJUCPwjLRAARZ0KEaxewYcYHT3j5Gl5Cg==',
-#       $ceph_secret_cinder     => 'AQAvxQpVKJ03KxAADFv78tedrAWZx1SoRdsQUA==',
-#       $ceph_secret_cinderbkup => 'AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==',
-#	$os_admin_token         => '12345678901234567890',
-#	$os_admin_email         => 'admin@mail',
-#	$os_admin_passwd        => '<ADMIN_PASSWORD>',
-#	$os_admin_tenant        => 'admin',
-#	$os_tenants  		=> {'test'=> { description => 'OCP in HA'}},
-#	$os_users    		=> {'guest' => {password => 'pippo', tenant => 'test', email => 'alessandro.costantini@cnaf.infn.it' }},
+#	ceph_secret_glance     => $ceph_secret_glance, 
+#       ceph_secret_cinder     => $ceph_secret_cinder,
+#       ceph_secret_cinderbkup => $ceph_secret_cinderbkup,
+#	os_admin_token         => '12345678901234567890',
+#	os_admin_email         => 'admin@mail',
+#	os_admin_passwd        => '<ADMIN_PASSWORD>',
+#	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',
+#	cinder_volsize = '8G',
 #	##Neutron networks - override
 #	#Network1
-#	$neutron_ext1_network 	=> '10.10.98.0/24',
-#	$neutron_ext1_gateway 	=> '10.10.98.1',
-#	$neutron_ext1_ipstart 	=> '10.10.98.121',
-#	$neutron_ext1_ipend   	=> '10.10.98.125',
-#	$neutron_private1       => '10.0.1.0/24',
+#	neutron_ext1_network 	=> '10.10.98.0/24',
+#	neutron_ext1_gateway 	=> '10.10.98.1',
+#	neutron_ext1_ipstart 	=> '10.10.98.121',
+#	neutron_ext1_ipend   	=> '10.10.98.125',
+#	neutron_private1       => '10.0.1.0/24',
 #	#Network2
-#	$neutron_ext2_network 	=> undef,
-#	$neutron_ext2_gateway 	=> undef,
-#	$neutron_ext2_ipstart 	=> undef,
-#	$neutron_ext2_ipend   	=> undef,
-#	$neutron_private2       => undef,
+#	neutron_ext2_network 	=> undef,
+#	neutron_ext2_gateway 	=> undef,
+#	neutron_ext2_ipstart 	=> undef,
+#	neutron_ext2_ipend   	=> undef,
+#	neutron_private2       => undef,
 #  }
 #
 #  if $zabbix_install {
@@ -179,11 +187,11 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #  include 'iaas::role::iaasbase'
 #  class {'iaas::role::network':
 #	##Network1 - external
-#	$neutron_ext1_network => '10.10.98.0/24',
-#	$neutron_ext1_gateway => '10.10.98.1',
+#	neutron_ext1_network => '10.10.98.0/24',
+#	neutron_ext1_gateway => '10.10.98.1',
 #	##Network2 - external
-#	$neutron_ext2_network => undef,
-#	$neutron_ext2_gateway => undef,
+#	neutron_ext2_network => undef,
+#	neutron_ext2_gateway => undef,
 #	
 #	##MTU VM
 #	$mtu 		      => '1438',
@@ -201,9 +209,9 @@ $rabbit_erlang		= 'JTZEOFFHPRJOTLUWEFQR'
 #  include 'iaas::role::iaasbase'
 #  class {'iaas::role::compute':
 #	##CEPH Secrets override
-#	$ceph_secret_admin    	=> 'AQDgL/hUSC2kLBAAnWJaSiqJG+YMk+XV9sapnw==',
-#	$ceph_secret_cinder   	=> 'AQAvxQpVKJ03KxAADFv78tedrAWZx1SoRdsQUA==',
-#  	$libvirt_type		=> 'kvm',
+#	ceph_secret_admin    	=> $ceph_secret_admin,
+#	ceph_secret_cinder   	=> $ceph_secret_cinder,
+#  	libvirt_type		=> 'kvm',
 #  }
 #
 #  if $zabbix_install {