remapping global parameters

manifests/params.pp

@@ -38,70 +38,86 @@ $main_address = '<VIP_IP_public>', # The main virtual address pointing to the lo
 #VIP2
 $admin_address = '<VIP_IP_private>', # The private virtual address pointing to the load-balancers
 #Endpoints
-$endpoint_servers = ['<HOSTNAME_SERVER1>', '<HOSTNAME_SERVER2>', '<HOSTNAME_SERVER3>'],
+$rhmk_hostnames = ['<HOSTNAME_SERVER1>', '<HOSTNAME_SERVER2>', '<HOSTNAME_SERVER3>'],
+$rhmk_ips = ['<IP_SERVER1>', '<IP_SERVER2>', '<IP_SERVER3>'],
+#$endpoint_servers = ['<HOSTNAME_SERVER1>', '<HOSTNAME_SERVER2>', '<HOSTNAME_SERVER3>'],
 
 ##RabbitMQ
-$rabbit_hosts = ['<HOSTNAME_SERVER1>:5672', '<HOSTNAME_SERVER2>:5672', '<HOSTNAME_SERVER3>:5672'],
+#Replaced by $rhmk_ips + suffix()
+#$rabbit_hosts = ['<HOSTNAME_SERVER1>:5672', '<HOSTNAME_SERVER2>:5672', '<HOSTNAME_SERVER3>:5672'],
 $rabbit_user = 'openstack',
 $rabbit_password = 'openstack',
 
 ##DB_params
 #Mongo_prams
-$mongo_endpoint_coordination = ['<HOSTNAME_SERVER1>:27017','<HOSTNAME_SERVER2>:27017','<HOSTNAME_SERVER3>:27017'],
+#Replaced by $rhmk_ips + suffix()
+#$mongo_endpoint_coordination = ['<HOSTNAME_SERVER1>:27017','<HOSTNAME_SERVER2>:27017','<HOSTNAME_SERVER3>:27017'],
 #MysqlDB
-$db_keystone_user = 'keystone',
+#$db_keystone_user = 'keystone',
 $db_keystone_password = 'keystone',
-$db_glance_user = 'glance',
+#$db_glance_user = 'glance',
 $db_glance_password = 'glance',
-$db_cinder_user = 'cinder',
+#$db_cinder_user = 'cinder',
 $db_cinder_password = 'cinder',
-$db_nova_user  = 'nova',
+#$db_nova_user  = 'nova',
 $db_nova_password  ='nova',
-$db_neutron_user = 'neutron',
+#$db_neutron_user = 'neutron',
 $db_neutron_password = 'neutron',
-$db_heat_user = 'heat',
+#$db_heat_user = 'heat',
 $db_heat_password = 'heat',
 #MongoDB
-$db_ceilometer_user = 'ceilometer',
+#$db_ceilometer_user = 'ceilometer',
 $db_ceilometer_password = 'ceilometer',
 
+##Controllers
+$controller_ips = ['<CONTROLLER1_IP>', '<CONTROLLER2_IP>'],
+$controller_hostnames = ['<CONTROLLER1_HOSTNAME>', '<CONTROLLER2_HOSTNAME>'],
+
 ##Memcache
-$memcache = ['<HOSTNAME_CONTROLLER1>:11211','<HOSTNAME_CONTROLLER2>:11211'],
+#Replaced by $controller_ips + suffix()
+#$memcache = ['<HOSTNAME_CONTROLLER1>:11211','<HOSTNAME_CONTROLLER2>:11211'],
 
 ##Neutron
-$neutron_password = 'neutron',
-$neutron_secret = 'neutron',
+#$neutron_password = 'neutron',
+#$neutron_secret = 'neutron',
+$openstack_neutron_password = 'neutron',
+$openstack_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',
+#$nova_password = 'nova',
+#$nova_default_flotting_pool = 'ext-net',
+$openstack_nova_password = 'nova',
+$openstack_nova_default_flotting_pool = 'ext-net',
 
 ##Ceilometer
-$ceilometer_password = 'ceilometer',
-$ceilometer_secret = 'ceilometer',
+#$ceilometer_password = 'ceilometer',
+#$ceilometer_secret = 'ceilometer',
+$openstack_ceilometer_password = 'ceilometer',
+$openstack_ceilometer_secret = 'ceilometer',
 
 ##Glance
-$glance_password = 'glance',
+#$glance_password = 'glance',
+$openstack_glance_password = 'glance',
 
 ##Cinder
-$cinder_password = 'cinder',
-$cinder_secret = '5e899071-df68-40d3-b0ea-6ec22b7c12a0',
+#$cinder_password = 'cinder',
+#$cinder_secret = '5e899071-df68-40d3-b0ea-6ec22b7c12a0',
+$openstack_cinder_password = 'cinder',
+$openstack_cinder_secret = '5e899071-df68-40d3-b0ea-6ec22b7c12a0',
 
 ##Heat
-$heat_password = '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',
+$openstack_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',
+$openstack_heat_encryption_key = '12345678912345678912345678912345',
 
 ##Horizon
-$horizon_secret = 'horizon',
-
-#Controller (da spostare in controller.pp?)
-#$admin_token = '<ADMIN_TOKEN>',
-#$admin_email = 'admin@mail',
-#$admin_password = '<ADMIN_PASSWD>',
-#$admin_tenant = 'admin',
+#$horizon_secret = 'horizon',
+$openstack_horizon_secret = 'horizon',
 
 ){