stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Rename $galera_master to $galera_master_name to match new guideline

Browse Source 
In order to match the new guideline in site.pp this field needs to be renamed
from `$galera_master` to `$galera_master_name`

close #50
This commit is contained in:
Yanis Guenane 2014-01-24 15:05:57 -05:00
parent b4683ded87
commit cf517f9e51
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/database/sql.pp
View File

@ -20,7 +20,7 @@ class cloud::database::sql (
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$service_provider = 'sysv', $service_provider = 'sysv',
$galera_nextserver = $os_params::galera_nextserver, $galera_nextserver = $os_params::galera_nextserver,
$galera_master = $os_params::galera_master, $galera_master_name = $os_params::galera_master_name,
$keystone_db_host = $os_params::keystone_db_host, $keystone_db_host = $os_params::keystone_db_host,
$keystone_db_user = $os_params::keystone_db_user, $keystone_db_user = $os_params::keystone_db_user,
$keystone_db_password = $os_params::keystone_db_password, $keystone_db_password = $os_params::keystone_db_password,
@ -98,7 +98,7 @@ class cloud::database::sql (
notify => Service['xinetd'], notify => Service['xinetd'],
} }
if $::hostname == $galera_master { if $::hostname == $galera_master_name {
# OpenStack DB # OpenStack DB
class { 'keystone::db::mysql': class { 'keystone::db::mysql':
@ -176,7 +176,7 @@ class cloud::database::sql (
Database_user<<| |>> Database_user<<| |>>
} # if $::hostname == $galera_master } # if $::hostname == $galera_master_name
# Haproxy http monitoring # Haproxy http monitoring
file_line { 'mysqlchk-in-etc-services': file_line { 'mysqlchk-in-etc-services':
@ -236,7 +236,7 @@ class cloud::database::sql (
ipaddresses => $api_eth, ipaddresses => $api_eth,
ports => '3306', ports => '3306',
options => options =>
inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname != @galera_master -%>backup<% end %>') inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname != @galera_master_name -%>backup<% end %>')
} }
} }

4
spec/classes/cloud_database_sql_spec.rb
View File

@ -30,7 +30,7 @@ describe 'cloud::database::sql' do
{ {
:service_provider => 'sysv', :service_provider => 'sysv',
:api_eth => '10.0.0.1', :api_eth => '10.0.0.1',
:galera_master => '10.0.0.1', :galera_master_name => 'os-ci-test1',
:galera_nextserver => ['10.0.0.1','10.0.0.2','10.0.0.3'], :galera_nextserver => ['10.0.0.1','10.0.0.2','10.0.0.3'],
:keystone_db_host => '10.0.0.1', :keystone_db_host => '10.0.0.1',
:keystone_db_user => 'keystone', :keystone_db_user => 'keystone',
@ -96,7 +96,7 @@ describe 'cloud::database::sql' do
context 'configure databases on the galera master server' do context 'configure databases on the galera master server' do
before :each do before :each do
facts.merge!( :hostname => '10.0.0.1' ) facts.merge!( :hostname => 'os-ci-test1' )
end end
it 'configure keystone database' do it 'configure keystone database' do

4
templates/database/mysql.conf.erb
View File

@ -42,8 +42,8 @@ innodb_autoinc_lock_mode = 2
innodb_locks_unsafe_for_binlog = 1 innodb_locks_unsafe_for_binlog = 1
wsrep_provider = "<%= @wsrep_provider %>" wsrep_provider = "<%= @wsrep_provider %>"
wsrep_cluster_name = "galera_cluster" wsrep_cluster_name = "galera_cluster"
<% if @hostname != @galera_master -%> <% if @hostname != @galera_master_name -%>
# This node is not Galera Master (connect wsrep to galera_master) # This node is not Galera Master (connect wsrep to galera_master_name)
wsrep_cluster_address = "gcomm://<%= @galera_nextserver[0] %>" wsrep_cluster_address = "gcomm://<%= @galera_nextserver[0] %>"
<% else -%> <% else -%>
# This node is Galera Master (connect wsrep to localhost) # This node is Galera Master (connect wsrep to localhost)