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

6 files changed, 35 insertions, 9 deletions

diff --git a/manifests/profile/pacemaker/nova.pp b/manifests/profile/pacemaker/nova.pp
index b6e6cba..13c6128 100644
--- a/manifests/profile/pacemaker/nova.pp
+++ b/manifests/profile/pacemaker/nova.pp
@@ -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
 
 }
diff --git a/manifests/profile/pacemaker/nova/api.pp b/manifests/profile/pacemaker/nova/api.pp
index 5d8e11f..30ab733 100644
--- a/manifests/profile/pacemaker/nova/api.pp
+++ b/manifests/profile/pacemaker/nova/api.pp
@@ -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),
   }
diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp
index 76dc462..495c92e 100644
--- a/manifests/profile/pacemaker/nova/conductor.pp
+++ b/manifests/profile/pacemaker/nova/conductor.pp
@@ -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',
diff --git a/manifests/profile/pacemaker/nova/consoleauth.pp b/manifests/profile/pacemaker/nova/consoleauth.pp
index 54f17b7..fb9428a 100644
--- a/manifests/profile/pacemaker/nova/consoleauth.pp
+++ b/manifests/profile/pacemaker/nova/consoleauth.pp
@@ -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',
diff --git a/manifests/profile/pacemaker/nova/scheduler.pp b/manifests/profile/pacemaker/nova/scheduler.pp
index 6516394..9e78c30 100644
--- a/manifests/profile/pacemaker/nova/scheduler.pp
+++ b/manifests/profile/pacemaker/nova/scheduler.pp
@@ -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',
diff --git a/manifests/profile/pacemaker/nova/vncproxy.pp b/manifests/profile/pacemaker/nova/vncproxy.pp
index 7f7d095..ec71ca7 100644
--- a/manifests/profile/pacemaker/nova/vncproxy.pp
+++ b/manifests/profile/pacemaker/nova/vncproxy.pp
@@ -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',