From 0965e9d6aa3691a7e88d39f5acff7e746c4f6e4f Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 25 Feb 2014 10:29:24 -0500 Subject: [PATCH] Set default parameters for database/nosql.pp and database/sql.pp Related to #1 --- manifests/database/nosql.pp | 4 +-- manifests/database/sql.pp | 64 ++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index fd09d5ef..85aedf2a 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -36,9 +36,9 @@ # class cloud::database::nosql( - $bind_ip = $os_params::internal_netif_ip, + $bind_ip = '127.0.0.1', $nojournal = false, - $replset_members = $os_params::mongo_nodes + $replset_members = ['mgmt001'] ) { # bind_ip should be an array diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index a80fc535..0daaaa23 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -20,39 +20,39 @@ # [*galera_internal_ips*] # Array of internal ip of the galera nodes. class cloud::database::sql ( - $api_eth = $os_params::api_eth, + $api_eth = '127.0.0.1', $service_provider = 'sysv', - $galera_master_name = $os_params::galera_master_name, - $galera_internal_ips = $os_params::galera_internal_ips, - $keystone_db_host = $os_params::keystone_db_host, - $keystone_db_user = $os_params::keystone_db_user, - $keystone_db_password = $os_params::keystone_db_password, - $keystone_db_allowed_hosts = $os_params::keystone_db_allowed_hosts, - $cinder_db_host = $os_params::cinder_db_host, - $cinder_db_user = $os_params::cinder_db_user, - $cinder_db_password = $os_params::cinder_db_password, - $cinder_db_allowed_hosts = $os_params::cinder_db_allowed_hosts, - $glance_db_host = $os_params::glance_db_host, - $glance_db_user = $os_params::glance_db_user, - $glance_db_password = $os_params::glance_db_password, - $glance_db_allowed_hosts = $os_params::glance_db_allowed_hosts, - $heat_db_host = $os_params::heat_db_host, - $heat_db_user = $os_params::heat_db_user, - $heat_db_password = $os_params::heat_db_password, - $heat_db_allowed_hosts = $os_params::heat_db_allowed_hosts, - $nova_db_host = $os_params::nova_db_host, - $nova_db_user = $os_params::nova_db_user, - $nova_db_password = $os_params::nova_db_password, - $nova_db_allowed_hosts = $os_params::nova_db_allowed_hosts, - $neutron_db_host = $os_params::neutron_db_host, - $neutron_db_user = $os_params::neutron_db_user, - $neutron_db_password = $os_params::neutron_db_password, - $neutron_db_allowed_hosts = $os_params::neutron_db_allowed_hosts, - $mysql_root_password = $os_params::mysql_root_password, - $mysql_sys_maint_password = $os_params::mysql_sys_maint_password, - $galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser, - $galera_clustercheck_dbpassword = $os_params::galera_clustercheck_dbpassword, - $galera_clustercheck_ipaddress = $os_params::internal_netif_ip + $galera_master_name = 'mgmt001', + $galera_internal_ips = ['127.0.0.1'], + $keystone_db_host = '127.0.0.1', + $keystone_db_user = 'keystone', + $keystone_db_password = 'keystonepassword', + $keystone_db_allowed_hosts = ['127.0.0.1'], + $cinder_db_host = '127.0.0.1', + $cinder_db_user = 'cinder', + $cinder_db_password = 'cinderpassword', + $cinder_db_allowed_hosts = ['127.0.0.1'], + $glance_db_host = '127.0.0.1', + $glance_db_user = 'glance', + $glance_db_password = 'glancepassword', + $glance_db_allowed_hosts = ['127.0.0.1'], + $heat_db_host = '127.0.0.1', + $heat_db_user = 'heat', + $heat_db_password = 'heatpassword', + $heat_db_allowed_hosts = ['127.0.0.1'], + $nova_db_host = '127.0.0.1', + $nova_db_user = 'nova', + $nova_db_password = 'novapassword', + $nova_db_allowed_hosts = ['127.0.0.1'], + $neutron_db_host = '127.0.0.1', + $neutron_db_user = 'neutron', + $neutron_db_password = 'neutronpassword', + $neutron_db_allowed_hosts = ['127.0.0.1'], + $mysql_root_password = 'rootpassword', + $mysql_sys_maint_password = 'sys_maint', + $galera_clustercheck_dbuser = 'clustercheckdbuser', + $galera_clustercheck_dbpassword = 'clustercheckpassword', + $galera_clustercheck_ipaddress = '127.0.0.1' ) { include 'xinetd'