diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-06 14:56:43 -0400 |
|---|---|---|
| committer |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-06-14 12:00:56 +0300 |
| commit | 94bf2d5a0cfa2eacf93f5c7c9604f12064e6afd5 (patch) | |
| tree | f7a2f17e688242bea752040f5ce20f32558eea60 /puppet/manifests | |
| parent | 27ee21d9bdf3a60d1f5e46ef9a80a9a2e6fe5992 (diff) | |
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
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 8 |
2 files changed, 0 insertions, 10 deletions
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', |