From 94bf2d5a0cfa2eacf93f5c7c9604f12064e6afd5 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 6 Jun 2016 14:56:43 -0400
Subject: Enable nova-scheduler as a composable service

Implement NovaScheduler service using nova-base for common parameters.

Depends-On: I5e1c90e3c6dc556f872ced73744c5c74caaa3635
Change-Id: Ie50716a09c53d656835b16991128c94b35cf1ed2
Implements: blueprint composable-services-within-roles
---
 puppet/manifests/overcloud_controller.pp           | 2 --
 puppet/manifests/overcloud_controller_pacemaker.pp | 8 --------
 2 files changed, 10 deletions(-)

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 7bd94225..366f98cf 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -154,8 +154,6 @@ if hiera('step') >= 4 {
   include ::nova::consoleauth
   include ::nova::network::neutron
   include ::nova::vncproxy
-  include ::nova::scheduler
-  include ::nova::scheduler::filter
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
 
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 5510b4fb..9162f937 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -358,11 +358,6 @@ MYSQL_HOST=localhost\n",
     manage_service => false,
     enabled        => false,
   }
-  include ::nova::scheduler::filter
-  class { '::nova::scheduler' :
-    manage_service => false,
-    enabled        => false,
-  }
   include ::nova::network::neutron
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
@@ -716,9 +711,6 @@ password=\"${mysql_root_password}\"",
     pacemaker::resource::service { $::nova::params::vncproxy_service_name :
       clone_params => 'interleave=true',
     }
-    pacemaker::resource::service { $::nova::params::scheduler_service_name :
-      clone_params => 'interleave=true',
-    }
 
     pacemaker::constraint::base { 'keystone-then-nova-consoleauth-constraint':
       constraint_type => 'order',
-- 
cgit 1.2.3-korg