Revert "moved parameters from rhmk to params.pp"

This reverts commit 13860f75.

manifests/params.pp

@@ -6,48 +6,5 @@ class iaas::params(
   $dns_servers = ['10.0.0.4','10.0.0.3'],
   $dns_searchdomain = '.openstacklocal',
 ){
-  ## ====
-  ## RHMK
-  ## ====
-
-    # GLOBAL
-    $hostnames			= ['<hostname1>','<hostnameN>']
-    $ips			= ['<ip1>','<ipN>']
-
-    # MYSQL
-    $percona_master 		= false
-    $mysql_root_pwd		= undef
-    $keystone_pwd		= 'keystone'
-    $glance_pwd			= 'glance'
-    $nova_pwd			= 'nova'
-    $cinder_pwd			= 'cinder'
-    $neutron_pwd		= 'neutron'
-    $heat_pwd			= 'heat'
-
-    # MONGODB
-    $mongo_master		= false
-    $mongo_bootstrap 		= false
-    $mongo_key			= 'Uf+8s0LbxIxNrbyEC1kw'
-    $mongo_password		= undef
-    $ceilometer_pwd		= 'ceilometer'
-
-    # KEEPALIVED
-    $keepalived_priority 	= 100
-    $keepalived_state 		= 'BACKUP'
-    $keepalived_notification_mail	= 'account@domain1'
-    $keepalived_notification_mail_from  = 'noreply-keepalived-ocpops1@cnaf.infn.it'
-    $keepalived_smtp_server		= 'smtp.server1'
-
-    # HAPROXY
-    $haproxy_controller_hosts 	= ['<hostname1>','<hostnameN>']
-    $haproxy_controller_ips 	= ['<ip1>','<ipN>']
-
-    # RABBITMQ
-    $rabbit_hostname 		= $hostname
-    $rabbit_user                = 'openstack'
-    $rabbit_password            = 'openstack'
-    $rabbit_erlang              = 'JTZEOFFHPRJOTLUWEFQR'
-
-    # ZOOKEEPER
-    $zookeeper_id 		= undef 
+  
 }

manifests/role/rhmk.pp

@@ -11,39 +11,39 @@
 #
 class iaas::role::rhmk(
     # GLOBAL
-    $hostnames			= $iaas::params::hostnames,
-    $ips			= $iaas::params::ips,
+    $hostnames			= ['<hostname1>','<hostnameN>'],
+    $ips			= ['<ip1>','<ipN>'],
     # MYSQL
-    $percona_master 		= $iaas::params::percona_master,
-    $mysql_root_pwd		= $iaas::params::mysql_root_pwd,
-    $keystone_pwd		= $iaas::params::keystone_pwd,
-    $glance_pwd			= $iaas::params::glance_pwd,
-    $nova_pwd			= $iaas::params::nova_pwd,
-    $cinder_pwd			= $iaas::params::cinder_pwd,
-    $neutron_pwd		= $iaas::params::neutron_pwd,
-    $heat_pwd			= $iaas::params::heat_pwd,
+    $percona_master 		= false,
+    $mysql_root_pwd		= undef,
+    $keystone_pwd		= 'keystone',
+    $glance_pwd			= 'glance',
+    $nova_pwd			= 'nova',
+    $cinder_pwd			= 'cinder',
+    $neutron_pwd		= 'neutron',
+    $heat_pwd			= 'heat',
     # MONGODB
-    $mongo_master		= $iaas::params::mongo_master,
-    $mongo_bootstrap 		= $iaas::params::mongo_bootstrap,
-    $mongo_key			= $iaas::params::mongo_key,
-    $mongo_password		= $iaas::params::mongo_password,
-    $ceilometer_pwd		= $iaas::params::ceilometer_pwd,
+    $mongo_master		= false,
+    $mongo_bootstrap 		= false,
+    $mongo_key			= 'Uf+8s0LbxIxNrbyEC1kw',
+    $mongo_password		= undef,
+    $ceilometer_pwd		= 'ceilometer',
     # KEEPALIVED
-    $keepalived_priority 	= $iaas::params::keepalived_priority,
-    $keepalived_state 		= $iaas::params::keepalived_state,
-    $keepalived_notification_mail	= $iaas::params::keepalived_notification_mail,
-    $keepalived_notification_mail_from  = $iaas::params::keepalived_notification_mail_from,
-    $keepalived_smtp_server		= $iaas::params::keepalived_smtp_server,
+    $keepalived_priority 	= 100,
+    $keepalived_state 		= 'BACKUP',
+    $keepalived_notification_mail	= 'account@domain1',
+    $keepalived_notification_mail_from  = 'noreply-keepalived-ocpops1@cnaf.infn.it',
+    $keepalived_smtp_server		= 'smtp.server1',
     # HAPROXY
-    $haproxy_controller_hosts 	= $iaas::params::haproxy_controller_hosts,
-    $haproxy_controller_ips 	= $iaas::params::haproxy_controller_ips,
+    $haproxy_controller_hosts 	= ['<hostname1>','<hostnameN>'],
+    $haproxy_controller_ips 	= ['<ip1>','<ipN>'],
     # RABBITMQ
-    $rabbit_hostname 		= $iaas::params::rabbit_hostname,
-    $rabbit_user                = $iaas::params::rabbit_user,
-    $rabbit_password            = $iaas::params::rabbit_password,
-    $rabbit_erlang              = $iaas::params::rabbit_erlang,
+    $rabbit_hostname 		= $hostname,
+    $rabbit_user                = 'openstack',
+    $rabbit_password            = 'openstack',
+    $rabbit_erlang              = 'JTZEOFFHPRJOTLUWEFQR',
     # ZOOKEEPER
-    $zookeeper_id 		= $iaas::params::zookeeper_id,
+    $zookeeper_id 		= undef,
   ) {
 
   # Base