From 80ad670ad835add380161ca33704701506189adb Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 6 Jun 2016 15:40:37 -0400
Subject: Enable nova-consoleauth as a composable service

Implement NovaConsoleauth service using nova-base for common
meters.

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

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 366f98cf..86ad3c50 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -151,7 +151,6 @@ if hiera('step') >= 4 {
     memcached_servers => $memcached_servers
   }
   include ::nova::config
-  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 9162f937..4084e734 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -350,10 +350,6 @@ MYSQL_HOST=localhost\n",
 
   include ::nova::config
 
-  class { '::nova::consoleauth' :
-    manage_service => false,
-    enabled        => false,
-  }
   class { '::nova::vncproxy' :
     manage_service => false,
     enabled        => false,
@@ -704,10 +700,6 @@ password=\"${mysql_root_password}\"",
     }
 
     # Nova
-    pacemaker::resource::service { $::nova::params::consoleauth_service_name :
-      clone_params => 'interleave=true',
-      require      => Pacemaker::Resource::Ocf['openstack-core'],
-    }
     pacemaker::resource::service { $::nova::params::vncproxy_service_name :
       clone_params => 'interleave=true',
     }
-- 
cgit 1.2.3-korg