openstack
/
fuel-library
Code Issues Proposed changes

Merge "Add contain for proper relationship between classes" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-31 14:33:42 +00:00 committed by Gerrit Code Review
parent 5b0c5702c3 b24fafbadb
commit cf3426abe8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/cluster/manifests/galera_status.pp
View File

@ -64,7 +64,7 @@ class cluster::galera_status (
default => 'nobody',
}
include ::xinetd
contain ::xinetd
xinetd::service { 'galeracheck':
bind => $address,
port => $port,

9
deployment/puppet/osnailyfacter/manifests/database/database.pp
View File

@ -343,15 +343,18 @@ class osnailyfacter::database::database {
access_networks => $access_networks,
require => Class['::osnailyfacter::mysql_access'],
}
# We need to create user for galera cluster check
class { '::cluster::galera_grants':
status_user => $status_user,
status_password => $status_password,
status_allow => $galera_node_address,
}
Class['::cluster::mysql'] -> Class['::cluster::galera_grants'] -> Class['::cluster::galera_status']
Class['::cluster::mysql'] ->
Class['::cluster::galera_grants'] ->
Class['::cluster::galera_status']
}
Class['::cluster::mysql'] -> Class['::cluster::galera_status'] -> ::Osnailyfacter::Wait_for_backend['mysql']
Class['::cluster::mysql'] ->
Class['::cluster::galera_status'] ->
::Osnailyfacter::Wait_for_backend['mysql']
}
}