aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-06-06 15:40:37 -0400
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-06-14 12:00:56 +0300
commit80ad670ad835add380161ca33704701506189adb (patch)
tree3125a930f98a929c51e4fd01d5bff7575db2d625 /puppet/manifests
parent94bf2d5a0cfa2eacf93f5c7c9604f12064e6afd5 (diff)
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
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp8
2 files changed, 0 insertions, 9 deletions
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',
}