openstack/puppet-tripleo
Code Issues Proposed changes

Merge "nova: do not manage nova-compute with pacemaker"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 08:45:35 +00:00 committed by Gerrit Code Review
commit d871899c6b
6 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/pacemaker/nova.pp
View File

@ -26,15 +26,6 @@ class tripleo::profile::pacemaker::nova (
$step = hiera('step'),
) {
Service <|
tag == 'nova-service'
|> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
include ::tripleo::profile::base::nova
}

7
manifests/profile/pacemaker/nova/api.pp
View File

@ -35,6 +35,13 @@ class tripleo::profile::pacemaker::nova::api (
include ::nova::params
include ::tripleo::profile::pacemaker::nova
Service<| title == 'nova-api' |> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
class { '::tripleo::profile::base::nova::api':
sync_db => (downcase($::hostname) == $pacemaker_master),
}

7
manifests/profile/pacemaker/nova/conductor.pp
View File

@ -36,6 +36,13 @@ class tripleo::profile::pacemaker::nova::conductor (
include ::tripleo::profile::pacemaker::nova
include ::tripleo::profile::base::nova::conductor
Service<| title == 'nova-conductor' |> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::conductor_service_name:
clone_params => 'interleave=true',

7
manifests/profile/pacemaker/nova/consoleauth.pp
View File

@ -36,6 +36,13 @@ class tripleo::profile::pacemaker::nova::consoleauth (
include ::tripleo::profile::pacemaker::nova
include ::tripleo::profile::base::nova::consoleauth
Service<| title == 'nova-consoleauth' |> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::consoleauth_service_name:
clone_params => 'interleave=true',

7
manifests/profile/pacemaker/nova/scheduler.pp
View File

@ -36,6 +36,13 @@ class tripleo::profile::pacemaker::nova::scheduler (
include ::tripleo::profile::pacemaker::nova
include ::tripleo::profile::base::nova::scheduler
Service<| title == 'nova-scheduler' |> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::scheduler_service_name:
clone_params => 'interleave=true',

7
manifests/profile/pacemaker/nova/vncproxy.pp
View File

@ -36,6 +36,13 @@ class tripleo::profile::pacemaker::nova::vncproxy (
include ::tripleo::profile::pacemaker::nova
include ::tripleo::profile::base::nova::vncproxy
Service<| title == 'nova-vncproxy' |> {
hasrestart => true,
restart => '/bin/true',
start => '/bin/true',
stop => '/bin/true',
}
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::nova::params::vncproxy_service_name:
clone_params => 'interleave=true',