diff --git a/manifests/params.pp b/manifests/params.pp
index 4bb553764ade1fc3d2ff99d6f033ada868eb2fb9..6ee8ecaa8546aa921ed3f0b73b4c40b427240afa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -9,49 +9,117 @@ $data_interface = 'eth0',
$dns_servers = ['131.154.3.1','131.154.1.3'],
$dns_searchdomain = 'cloud.cnaf.infn.it',
+# Enable only if $public_interface != $external_device1
+$public_gateway = undef,
+$external_device1 = 'eth0',
+$external_device2 = undef,
+
+#CEPH
+$ceph_fsid = 'f65809d3-7961-4cd7-b731-a9bc94bc6e9c',
+# Uncomment if auth_type is different from 'cephx'
+#ceph_authentication_type = 'cephx',
+$ceph_mon_initial_members = 'ocp-05,ocp-06,ocp-07',
+$ceph_mon_host = '10.10.98.43,10.10.98.44,10.10.98.45',
+$ceph_osd_pool_default_pg_num = '100',
+$ceph_osd_pool_default_pgp_num = '100',
+$ceph_osd_pool_default_size = '3',
+$ceph_osd_pool_default_min_size = '2',
+$ceph_cluster_network = '10.10.98.0/24',
+$ceph_public_network = '10.10.98.0/24',
+$ceph_osd_journal_size = '2048',
-# Enable only if public_interface != external_device1
-$public_gateway = undef,
-$verbose = false,
-$debug = false,
+#Openstack general
+$verbose = false,
+$debug = false,
+$region = 'regionOne',
+
+#VIP1
+$main_hostname = '131.154.100.102', # VIP Hostname (public)
+$main_address = '131.154.100.102', # The main virtual address pointing to the load-balancers
+#VIP2
+$admin_address = '131.154.100.102', # The private virtual address pointing to the load-balancers
+
+#Endpoints
+$endpoint_servers = [131.154.100.118, 131.154.100.120, 131.154.100.121],
+
+#RabbitMQ
+$rabbit_hosts = ['131.154.100.118:5672', '131.154.100.120:5672', '131.154.100.121:5672'],
+$rabbit_user = 'openstack',
+$rabbit_password = 'openstack',
+
+#Mysql_params
+#none
+
+#Mongo_prams
+$mongo_endpoint_coordination = ['131.154.100.118:27017','131.154.100.120:27017','131.154.100.121:27017'],
+
+#MysqlDB
+$db_keystone_user = 'keystone',
+$db_keystone_password = 'keystone',
+$db_glance_user = 'glance',
+$db_glance_password = 'glance',
+$db_cinder_user = 'cinder',
+$db_cinder_password = 'cinder',
+$db_nova_user = 'nova',
+$db_nova_password ='nova',
+$db_neutron_user = 'neutron',
+$db_neutron_password = 'neutron',
+$db_heat_user = 'heat',
+$db_heat_password = 'heat',
+#MongoDB
+$db_ceilometer_user = 'ceilometer',
+$db_ceilometer_password = 'ceilometer',
+
+#Memcache
+$memcache = ['10.10.98.107:11211','10.10.98.108:11211'],
+
+#Neutron
+$neutron_password = 'neutron',
+$neutron_secret = 'neutron',
+$neutron_core_plugin = 'ml2',
+$neutron_service_plugins = ['router', 'lbaas', 'vpnaas', 'firewall', 'metering'],
+
+#Nova
+$nova_password = 'nova',
+$nova_default_flotting_pool = 'ext-net',
+
+#Ceilometer
+$ceilometer_password = 'ceilometer',
+$ceilometer_secret = 'ceilometer',
+
+# Glance
+$glance_password = 'glance',
+
+#Cinder
+$cinder_password = 'cinder',
+$cinder_secret = '5e899071-df68-40d3-b0ea-6ec22b7c12a0',
+
+#Heat
+$heat_password = 'heat',
+# https://bugs.launchpad.net/heat/+bug/1415887: "AES key must be either 16, 24, or 32 bytes long"
+$heat_encryption_key = '12345678912345678912345678912345',
+
+#Horizon
+$horizon_secret = 'horizon',
-#CEPH secret
-#$secret_client_admin = 'AQDgL/hUSC2kLBAAnWJaSiqJG+YMk+XV9sapnw==',
-#$secret_client_bootstraposd = 'AQDlL/hUUCpdFBAAZeo6mKj4yeKPmVKfUY5awA==',
-#$secret_client_glance = 'AQBgGdJUCPwjLRAARZ0KEaxewYcYHT3j5Gl5Cg==',
-#$secret_client_cinder = 'AQAvxQpVKJ03KxAADFv78tedrAWZx1SoRdsQUA==',
-#$secret_client_cinderbackup = 'AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==',
+#Controller (da spostare in controller.pp?)
+$admin_token = '36c428a03be7d4f3cb0c',
+$admin_email = 'alessandro.costantini@cnaf.infn.it',
+$admin_password = 'Benza@CNAF',
+$admin_tenant = 'admin',
-#$ceph = {:ceph => {:osd => '/dev/vdb'};}
-#$ceph = [
-# {osd => '/dev/vdb', journal => '/osd1'},
-# {osd => '/dev/vdc', journal => '/osd2'},
-#],
-#
-#$ceph2 = hiera('ceph')
-#
-#
-#ceph::osd {
-# '/dev/vdb':
-# journal => '/osd1';
-#
-# '/dev/vdc':
-# journal => '/osd2',
-# }
){
- # set specific values
- #CEPH
}
diff --git a/manifests/role/storage.pp b/manifests/role/storage.pp
index f2ae1920810ec0bcdbc5545c11f138ddb332381e..f1c68a158ae4866518b1530636ab92bd2cfd8904 100644
--- a/manifests/role/storage.pp
+++ b/manifests/role/storage.pp
@@ -1,6 +1,6 @@
class iaas::role::storage (
-##CEPH Secrets
+##CEPH Secrets - override
$secret_client_admin = 'AQDgL/hUSC2kLBAAnWJaSiqJG+YMk+XV9sapnw==',
$secret_client_bootstraposd = 'AQDlL/hUUCpdFBAAZeo6mKj4yeKPmVKfUY5awA==',
$secret_client_glance = 'AQBgGdJUCPwjLRAARZ0KEaxewYcYHT3j5Gl5Cg==',
@@ -9,36 +9,21 @@ $secret_client_cinderbackup = 'AQBKvuVUMHvaGhAADT6nvBv9LFs7dqpB8Kis0Q==',
$bootstrap_mds_key = 'AQBxkvVU4F+VDBAArxUf+8s0LbxIxNrbyEC1kw==',
$mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw==',
-##CEPH
-$fsid = 'f65809d3-7961-4cd7-b731-a9bc94bc6e9c',
+##CEPH - no override
+$fsid = $iaas::params::ceph_fsid,
# Uncomment if auth_type is different from 'cephx'
-#authentication_type = 'cephx',
-$mon_initial_members = 'ocp-05,ocp-06,ocp-07',
-$mon_host = '10.10.98.43,10.10.98.44,10.10.98.45',
-$osd_pool_default_size = '3',
-$osd_pool_default_min_size = '2',
-$cluster_network = '10.10.98.0/24',
-$public_network = '10.10.98.0/24',
-$osd_journal_size = '2048',
-
-##Old implementation (pseudo hash)
-#$ceph_osd1 = ['/dev/vdb,/osd1','/dev/vdc,/osd2'],
-#$ceph_pool1 = ['images,128', 'volumes,128', 'vms,128', 'backups,128'],
-##New implementation (hash array)
-#$ceph_pool2 = [{"pool" => "images", "pg_num" => "128"},
-# {"pool" => "volumes", "pg_num" => "128"},
-# {"pool" => "vms", "pg_num" => "128"},
-# {"pool" => "backups", "pg_num" => "128"}],
-#$ceph_osd2 = [{"partition" => "/dev/vdb", "journal" => "/osd1"},
-# {"partition" => "/dev/vdc", "journal" => "/osd2"}],
-##New implementation (hash)
-#$ceph_pool3 = {'images' => { pg_num => '128'},
-# 'volumes' => { pg_num => '128'},
-# 'vms' => { pg_num => '128'},
-# 'backups' => { pg_num => '128'}},
-#$ceph_osd3 = {'/dev/vdb'=> { journal => '/osd1'},
-# '/dev/vdc'=> { journal => '/osd2'}},
-
+#authentication_type = $iaas::params::ceph_authentication_type,
+$mon_initial_members = $iaas::params::ceph_mon_initial_members,
+$mon_host = $iaas::params::ceph_on_host,
+$osd_pool_default_pg_num = $iaas::params::ceph_osd_pool_default_pg_num,
+$osd_pool_default_pgp_num = $iaas::params::ceph_osd_pool_default_pgp_num,
+$osd_pool_default_size = $iaas::params::ceph_osd_pool_default_size,
+$osd_pool_default_min_size = $iaas::params::ceph_osd_pool_default_min_size,
+$cluster_network = $iaas::params::ceph_cluster_network,
+$public_network = $iaas::params::ceph_public_network,
+$osd_journal_size = $iaas::params::ceph_osd_journal_size,
+
+#CEPH - override
$ceph_pool = {'images' => { pg_num => '128'},
'volumes' => { pg_num => '128'},
'vms' => { pg_num => '128'},
@@ -137,8 +122,8 @@ $ceph_osd = {'/dev/vdb'=> { journal => '/osd1'},
#authentication_type => 'cephx',
mon_initial_members => $mon_initial_members,
mon_host => $mon_host,
- osd_pool_default_pg_num => '100',
- osd_pool_default_pgp_num => '100',
+ osd_pool_default_pg_num => $osd_pool_default_pg_num,
+ osd_pool_default_pgp_num => $osd_pool_default_pgp_num,
osd_pool_default_size => $osd_pool_default_size,
osd_pool_default_min_size => $osd_pool_default_min_size,
cluster_network => $cluster_network,