aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-06-06 16:33:24 -0400
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-06-14 12:00:56 +0300
commit16d04892919d097dc5a8470727b9b6f816682ba3 (patch)
tree436d217edb96ec928041bceb5465fb8e7595136a /puppet/manifests/overcloud_controller_pacemaker.pp
parent80ad670ad835add380161ca33704701506189adb (diff)
Enable nova-vncproxy as a composable service
Implement NovaVncproxy service using nova-base for common meters. Change-Id: I6463cad5aa722d8c8febac1414d03637d6daec37 Depends-On: I5bc2a77b5832706bd9167cf40e5a7e0f95d7b346 Implements: blueprint composable-services-within-roles
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
1 files changed, 0 insertions, 9 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 4084e73..1dc121a 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -349,11 +349,6 @@ MYSQL_HOST=localhost\n",
}
include ::nova::config
-
- class { '::nova::vncproxy' :
- manage_service => false,
- enabled => false,
- }
include ::nova::network::neutron
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
@@ -700,10 +695,6 @@ password=\"${mysql_root_password}\"",
}
# Nova
- pacemaker::resource::service { $::nova::params::vncproxy_service_name :
- clone_params => 'interleave=true',
- }
-
pacemaker::constraint::base { 'keystone-then-nova-consoleauth-constraint':
constraint_type => 'order',
first_resource => 'openstack-core-clone',