Variables updated

manifests/params.pp

@@ -6,8 +6,8 @@ $public_interface 	= 'eth0',
 $admin_interface	= 'eth0',
 $data_interface 	= 'eth0',
 ## Node -- base.pp
-$dns_servers		= ['131.154.3.1','131.154.1.3'],
-$dns_searchdomain	= 'cloud.cnaf.infn.it',
+$dns_servers		= ['DNS_SERVER1','DNS_SERVER2'],
+$dns_searchdomain	= 'searchdomain.localhost',
 
 # Enable only if $public_interface != $external_device1
 $public_gateway		= undef,
@@ -19,8 +19,8 @@ $external_device2 = undef,
 $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_mon_initial_members = '<CEPH_MONIM_1>,<CEPH_MONIM_2>,<CEPH_MONIM_3>',
+$ceph_mon_host = '<CEPH_MON_1>,<CEPH_MON_2>,<CEPH_MON_3>',
 $ceph_osd_pool_default_pg_num = '100',
 $ceph_osd_pool_default_pgp_num = '100',
 $ceph_osd_pool_default_size = '3',
@@ -39,16 +39,16 @@ $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
+$main_hostname = '<VIP_Hostname_public>', # VIP Hostname (public)
+$main_address = '<VIP_IP_public>', # 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
+$admin_address = '<VIP_IP_private>', # The private virtual address pointing to the load-balancers
 
 #Endpoints
-$endpoint_servers = [131.154.100.118, 131.154.100.120, 131.154.100.121],
+$endpoint_servers = ['<HOSTNAME_SERVER1>', '<HOSTNAME_SERVER2>', '<HOSTNAME_SERVER3>'],
 
 #RabbitMQ
-$rabbit_hosts = ['131.154.100.118:5672', '131.154.100.120:5672', '131.154.100.121:5672'],
+$rabbit_hosts = ['<HOSTNAME_SERVER1>:5672', '<HOSTNAME_SERVER2>:5672', '<HOSTNAME_SERVER3>:5672'],
 $rabbit_user = 'openstack',
 $rabbit_password = 'openstack',
 
@@ -56,7 +56,7 @@ $rabbit_password = 'openstack',
 #none
 
 #Mongo_prams
-$mongo_endpoint_coordination = ['131.154.100.118:27017','131.154.100.120:27017','131.154.100.121:27017'],
+$mongo_endpoint_coordination = ['<HOSTNAME_SERVER1>:27017','<HOSTNAME_SERVER2>:27017','<HOSTNAME_SERVER3>:27017'],
 
 #MysqlDB
 $db_keystone_user = 'keystone',
@@ -76,7 +76,7 @@ $db_ceilometer_user = 'ceilometer',
 $db_ceilometer_password = 'ceilometer',
 
 #Memcache
-$memcache = ['10.10.98.107:11211','10.10.98.108:11211'],
+$memcache = ['<HOSTNAME_CONTROLLER1>:11211','<HOSTNAME_CONTROLLER2>:11211'],
 
 #Neutron
 $neutron_password = 'neutron',
@@ -108,9 +108,9 @@ $heat_encryption_key = '12345678912345678912345678912345',
 $horizon_secret = 'horizon',
 
 #Controller (da spostare in controller.pp?)
-$admin_token = '36c428a03be7d4f3cb0c',
-$admin_email = 'alessandro.costantini@cnaf.infn.it',
-$admin_password = 'Benza@CNAF',
+$admin_token = '<ADMIN_TOKEN>',
+$admin_email = 'admin@mail',
+$admin_password = '<ADMIN_PASSWD>',
 $admin_tenant = 'admin',
 
 

manifests/role/storage.pp

@@ -34,38 +34,13 @@ $ceph_osd  =  {'/dev/vdb'=> { journal => '/osd1'},
 
 ) {
 
-#foo::map {$ceph_osd1:}
-#define foo::map () { notify {$name["title"]: } }
-
-
 # Ceph
 ##OSD
 
   create_resources( ceph::osd, $ceph_osd )
-#  iaas::resources::ceph::cephosd { $ceph_osd2: }
-#  ceph::osd {$ceph_osd2: }
-#  ceph::osd {
-#       '/dev/vdb':
-#         journal => '/osd1';
-#
-#       '/dev/vdc':
-#         journal => '/osd2',
-#  }
-
 
 ##POOL
   create_resources( ceph::pool, $ceph_pool )
-#  iaas::resources::ceph::cephpool { $ceph_pool2: }
-#  ceph::pool { 
-#                'images':
-#                  pg_num => 128;
-#                'volumes':
-#                  pg_num => 128;
-#                'vms':
-#                  pg_num => 128;
-#                'backups':
-#                  pg_num => 128,
-#  } 
 
 ##KEY
   ceph::key {