From 3d01f650f18b9e4f1892a6d9aa17f1bfc99b5091 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 1 Jun 2016 16:39:20 -0400
Subject: Enable nova-conductor as a composable service

Implement NovaConductor service using nova-base for common parameters.

* Move rabbitmq parameters from controller.yaml to nova-base service, as
  an example. More parameters will move in the future.
* Move nova-conductor bits from monolithic manifests to the new service
  using new profiles from puppet-tripleo.

Depends-On: Iaaf3a3c2528d9747e41f360a1fe55f95ed37b2d1
Implements: blueprint composable-services-within-roles

Change-Id: I178f092b74ae12f2cb6f006db7cb00e4d6bddfd8
---
 puppet/manifests/overcloud_controller.pp           | 1 -
 puppet/manifests/overcloud_controller_pacemaker.pp | 7 -------
 2 files changed, 8 deletions(-)

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 9b4e76cc..89569ae5 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -162,7 +162,6 @@ if hiera('step') >= 4 {
   include ::nova::config
   include ::nova::api
   include ::nova::cert
-  include ::nova::conductor
   include ::nova::consoleauth
   include ::nova::network::neutron
   include ::nova::vncproxy
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index dc53d6d4..10f0398c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -384,10 +384,6 @@ MYSQL_HOST=localhost\n",
     manage_service => false,
     enabled        => false,
   }
-  class { '::nova::conductor' :
-    manage_service => false,
-    enabled        => false,
-  }
   class { '::nova::consoleauth' :
     manage_service => false,
     enabled        => false,
@@ -839,9 +835,6 @@ password=\"${mysql_root_password}\"",
     pacemaker::resource::service { $::nova::params::api_service_name :
       clone_params => 'interleave=true',
     }
-    pacemaker::resource::service { $::nova::params::conductor_service_name :
-      clone_params => 'interleave=true',
-    }
     pacemaker::resource::service { $::nova::params::consoleauth_service_name :
       clone_params => 'interleave=true',
       require      => Pacemaker::Resource::Ocf['openstack-core'],
-- 
cgit 1.2.3-korg