Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempts to fix a race condition in sql #18

Merged
merged 1 commit into from Jun 2, 2016
Merged

Attempts to fix a race condition in sql #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 59 additions & 43 deletions puppet/manifests/overcloud_controller_pacemaker.pp
View file
Open in desktop
Expand Up @@ -67,6 +67,45 @@
include ::ntp
}

# Ceph
$enable_ceph = hiera('ceph_storage_count', 0) > 0 or hiera('enable_ceph_storage', false) or hiera('compute_enable_ceph_storage', false)

if $enable_ceph {
$mon_initial_members = downcase(hiera('ceph_mon_initial_members'))
if str2bool(hiera('ceph_ipv6', false)) {
$mon_host = hiera('ceph_mon_host_v6')
} else {
$mon_host = hiera('ceph_mon_host')
}
class { '::ceph::profile::params':
mon_initial_members => $mon_initial_members,
mon_host => $mon_host,
}
include ::ceph::conf
include ::ceph::profile::mon
}

if str2bool(hiera('enable_ceph_storage', false)) {
if str2bool(hiera('ceph_osd_selinux_permissive', true)) {
exec { 'set selinux to permissive on boot':
command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
onlyif => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config",
path => ['/usr/bin', '/usr/sbin'],
}

exec { 'set selinux to permissive':
command => 'setenforce 0',
onlyif => "which setenforce && getenforce | grep -i 'enforcing'",
path => ['/usr/bin', '/usr/sbin'],
} -> Class['ceph::profile::osd']
}

include ::ceph::conf
include ::ceph::profile::osd
}



$controller_node_ips = split(hiera('controller_node_ips'), ',')
$controller_node_names = split(downcase(hiera('controller_node_names')), ',')
if $enable_load_balancer {
Expand All @@ -79,6 +118,12 @@
}
}

Class['::ceph::conf'] ->
Class['::ceph::profile::mon'] -> Class['::ceph::profile::osd'] -> Class['::tripleo::loadbalancer']
Class['::ceph::profile::osd'] -> Class['::mysql::server']
Class['::ceph::profile::osd'] -> Class['::mongodb::server']


$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {
Expand Down Expand Up @@ -536,33 +581,39 @@
require => File['/etc/sysconfig/clustercheck'],
}

exec { 'sql-sleep':
command => "sleep 180 && echo 'SQL Sleep complete'",
require => Exec['galera-ready'],
path => "/usr/bin:/bin",
}

# Create all the database schemas
if $sync_db {
class { '::keystone::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::glance::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::nova::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::nova::db::mysql_api':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::neutron::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::cinder::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
class { '::heat::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}

if downcase(hiera('ceilometer_backend')) == 'mysql' {
class { '::ceilometer::db::mysql':
require => Exec['galera-ready'],
require => Exec['sql-sleep'],
}
}
if hiera('enable_sahara') {
Expand All @@ -575,42 +626,7 @@
# pre-install swift here so we can build rings
include ::swift

# Ceph
$enable_ceph = hiera('ceph_storage_count', 0) > 0 or hiera('enable_ceph_storage', false) or hiera('compute_enable_ceph_storage', false)

if $enable_ceph {
$mon_initial_members = downcase(hiera('ceph_mon_initial_members'))
if str2bool(hiera('ceph_ipv6', false)) {
$mon_host = hiera('ceph_mon_host_v6')
} else {
$mon_host = hiera('ceph_mon_host')
}
class { '::ceph::profile::params':
mon_initial_members => $mon_initial_members,
mon_host => $mon_host,
}
include ::ceph::conf
include ::ceph::profile::mon
}

if str2bool(hiera('enable_ceph_storage', false)) {
if str2bool(hiera('ceph_osd_selinux_permissive', true)) {
exec { 'set selinux to permissive on boot':
command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
onlyif => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config",
path => ['/usr/bin', '/usr/sbin'],
}

exec { 'set selinux to permissive':
command => 'setenforce 0',
onlyif => "which setenforce && getenforce | grep -i 'enforcing'",
path => ['/usr/bin', '/usr/sbin'],
} -> Class['ceph::profile::osd']
}

include ::ceph::conf
include ::ceph::profile::osd
}

if str2bool(hiera('enable_external_ceph', false)) {
if str2bool(hiera('ceph_ipv6', false)) {
Expand Down