X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller_pacemaker.pp;h=0bee6b001f59b00ec025e0a4a86d87d8156a1396;hb=a2614491be1cae82e4b04337184b75644633ce3f;hp=d6d14a830eb1dbf5bd63d100d0a8fdae368b14cf;hpb=ccb46a51ac8ca59865c04b681628edbc5a167530;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index d6d14a83..0bee6b00 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -21,12 +21,10 @@ Pcmk_resource <| |> {
 # TODO(jistr): use pcs resource provider instead of just no-ops
 Service <|
   tag == 'aodh-service' or
-  tag == 'cinder-service' or
   tag == 'ceilometer-service' or
   tag == 'gnocchi-service' or
   tag == 'neutron-service' or
-  tag == 'nova-service' or
-  tag == 'sahara-service'
+  tag == 'nova-service'
 |> {
   hasrestart => true,
   restart    => '/bin/true',
@@ -61,10 +59,6 @@ if hiera('step') >= 1 {
 
   include ::timezone
 
-  if count(hiera('ntp::servers')) > 0 {
-    include ::ntp
-  }
-
   $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
   $corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
   if $corosync_ipv6 {
@@ -102,17 +96,7 @@ if hiera('step') >= 1 {
   }
 
   if downcase(hiera('ceilometer_backend')) == 'mongodb' {
-    include ::mongodb::globals
-    include ::mongodb::client
-    class { '::mongodb::server' :
-      service_manage => false,
-    }
-  }
-
-  # Redis
-  class { '::redis' :
-    service_manage => false,
-    notify_service => false,
+    include ::mongodb::params
   }
 
   # Galera
@@ -174,6 +158,7 @@ if hiera('step') >= 1 {
 
 if hiera('step') >= 2 {
 
+
   # NOTE(gfidente): the following vars are needed on all nodes so they
   # need to stay out of pacemaker_master conditional.
   # The addresses mangling will hopefully go away when we'll be able to
@@ -200,24 +185,6 @@ if hiera('step') >= 2 {
       clone_params   => true,
     }
 
-    if downcase(hiera('ceilometer_backend')) == 'mongodb' {
-      pacemaker::resource::service { $::mongodb::params::service_name :
-        op_params    => 'start timeout=370s stop timeout=200s',
-        clone_params => true,
-        require      => Class['::mongodb::server'],
-      }
-      # NOTE (spredzy) : The replset can only be run
-      # once all the nodes have joined the cluster.
-      mongodb_conn_validator { $mongo_node_ips_with_port :
-        timeout => '600',
-        require => Pacemaker::Resource::Service[$::mongodb::params::service_name],
-        before  => Mongodb_replset[$mongodb_replset],
-      }
-      mongodb_replset { $mongodb_replset :
-        members => $mongo_node_ips_with_port_nobr,
-      }
-    }
-
     pacemaker::resource::ocf { 'galera' :
       ocf_agent_name  => 'heartbeat:galera',
       op_params       => 'promote timeout=300s on-fail=block',
@@ -227,15 +194,6 @@ if hiera('step') >= 2 {
       require         => Class['::mysql::server'],
       before          => Exec['galera-ready'],
     }
-
-    pacemaker::resource::ocf { 'redis':
-      ocf_agent_name  => 'heartbeat:redis',
-      master_params   => '',
-      meta_params     => 'notify=true ordered=true interleave=true',
-      resource_params => 'wait_last_known_master=true',
-      require         => Class['::redis'],
-    }
-
   }
   $mysql_root_password = hiera('mysql::server::root_password')
   $mysql_clustercheck_password = hiera('mysql_clustercheck_password')
@@ -289,19 +247,6 @@ if hiera('step') >= 2 {
 
   # Create all the database schemas
   if $sync_db {
-    class { '::nova::db::mysql':
-      require => Exec['galera-ready'],
-    }
-    class { '::nova::db::mysql_api':
-      require => Exec['galera-ready'],
-    }
-    class { '::neutron::db::mysql':
-      require => Exec['galera-ready'],
-    }
-    class { '::cinder::db::mysql':
-      require => Exec['galera-ready'],
-    }
-
     if downcase(hiera('ceilometer_backend')) == 'mysql' {
       class { '::ceilometer::db::mysql':
         require => Exec['galera-ready'],
@@ -313,9 +258,10 @@ if hiera('step') >= 2 {
         require => Exec['galera-ready'],
       }
     }
-    class { '::sahara::db::mysql':
-      require       => Exec['galera-ready'],
-    }
+
+    class { '::aodh::db::mysql':
+        require => Exec['galera-ready'],
+      }
   }
 
   # Ceph
@@ -397,35 +343,6 @@ MYSQL_HOST=localhost\n",
 
   include ::nova::config
 
-  class { '::nova::api' :
-    sync_db        => $sync_db,
-    sync_db_api    => $sync_db,
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::nova::cert' :
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::nova::conductor' :
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::nova::consoleauth' :
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::nova::vncproxy' :
-    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' {
 
     # TODO(devvesa) provide non-controller ips for these services
@@ -467,26 +384,14 @@ MYSQL_HOST=localhost\n",
     }
 
     # Configure Neutron
+    # TODO: when doing the composable midonet plugin, don't forget to
+    # set service_plugins to an empty array in Hiera.
     class {'::neutron':
       service_plugins => []
     }
 
   }
-  else {
-    # Neutron class definitions
-    include ::neutron
-  }
 
-  include ::neutron::config
-  class { '::neutron::server' :
-    sync_db        => $sync_db,
-    manage_service => false,
-    enabled        => false,
-  }
-  include ::neutron::server::notifications
-  if  hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
-    include ::neutron::plugins::nuage
-  }
   if  hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
     include ::neutron::plugins::opencontrail
   }
@@ -497,202 +402,14 @@ MYSQL_HOST=localhost\n",
       keystone_password => hiera('neutron::server::password')
     }
   }
-  if hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {
-    class { '::neutron::plugins::plumgrid' :
-      connection                   => hiera('neutron::server::database_connection'),
-      controller_priv_host         => hiera('keystone_admin_api_vip'),
-      admin_password               => hiera('admin_password'),
-      metadata_proxy_shared_secret => hiera('nova::api::neutron_metadata_proxy_shared_secret'),
-    }
-  }
-  include ::neutron::plugins::ml2
-  class { '::neutron::agents::ml2::ovs':
-    manage_service => false,
-    enabled        => false,
-  }
-
-  if 'cisco_ucsm' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-    include ::neutron::plugins::ml2::cisco::ucsm
-  }
-  if 'cisco_nexus' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-    include ::neutron::plugins::ml2::cisco::nexus
-    include ::neutron::plugins::ml2::cisco::type_nexus_vxlan
-  }
-  if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-    include ::neutron::plugins::ml2::cisco::nexus1000v
-
-    class { '::neutron::agents::n1kv_vem':
-      n1kv_source  => hiera('n1kv_vem_source', undef),
-      n1kv_version => hiera('n1kv_vem_version', undef),
-    }
-
-    class { '::n1k_vsm':
-      n1kv_source  => hiera('n1kv_vsm_source', undef),
-      n1kv_version => hiera('n1kv_vsm_version', undef),
-    }
-  }
-
-  if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-    include ::neutron::plugins::ml2::bigswitch::restproxy
-    include ::neutron::agents::bigswitch
-  }
-
-  include ::cinder
-  include ::cinder::config
-  class { '::cinder::api':
-    sync_db        => $sync_db,
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::cinder::scheduler' :
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::cinder::volume' :
-    manage_service => false,
-    enabled        => false,
-  }
-  include ::cinder::glance
-  include ::cinder::ceilometer
-  class { '::cinder::setup_test_volume':
-    size => join([hiera('cinder_lvm_loop_device_size'), 'M']),
-  }
-
-  $cinder_enable_iscsi = hiera('cinder_enable_iscsi_backend', true)
-  if $cinder_enable_iscsi {
-    $cinder_iscsi_backend = 'tripleo_iscsi'
-
-    cinder::backend::iscsi { $cinder_iscsi_backend :
-      iscsi_ip_address => hiera('cinder_iscsi_ip_address'),
-      iscsi_helper     => hiera('cinder_iscsi_helper'),
-    }
-  }
 
   if $enable_ceph {
-
     $ceph_pools = hiera('ceph_pools')
     ceph::pool { $ceph_pools :
       pg_num  => hiera('ceph::profile::params::osd_pool_default_pg_num'),
       pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'),
       size    => hiera('ceph::profile::params::osd_pool_default_size'),
     }
-
-    $cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]]
-
-  } else {
-    $cinder_pool_requires = []
-  }
-
-  if hiera('cinder_enable_rbd_backend', false) {
-    $cinder_rbd_backend = 'tripleo_ceph'
-
-    cinder::backend::rbd { $cinder_rbd_backend :
-      backend_host    => hiera('cinder::host'),
-      rbd_pool        => hiera('cinder_rbd_pool_name'),
-      rbd_user        => hiera('ceph_client_user_name'),
-      rbd_secret_uuid => hiera('ceph::profile::params::fsid'),
-      require         => $cinder_pool_requires,
-    }
-  }
-
-  if hiera('cinder_enable_eqlx_backend', false) {
-    $cinder_eqlx_backend = hiera('cinder::backend::eqlx::volume_backend_name')
-
-    cinder::backend::eqlx { $cinder_eqlx_backend :
-      volume_backend_name => hiera('cinder::backend::eqlx::volume_backend_name', undef),
-      san_ip              => hiera('cinder::backend::eqlx::san_ip', undef),
-      san_login           => hiera('cinder::backend::eqlx::san_login', undef),
-      san_password        => hiera('cinder::backend::eqlx::san_password', undef),
-      san_thin_provision  => hiera('cinder::backend::eqlx::san_thin_provision', undef),
-      eqlx_group_name     => hiera('cinder::backend::eqlx::eqlx_group_name', undef),
-      eqlx_pool           => hiera('cinder::backend::eqlx::eqlx_pool', undef),
-      eqlx_use_chap       => hiera('cinder::backend::eqlx::eqlx_use_chap', undef),
-      eqlx_chap_login     => hiera('cinder::backend::eqlx::eqlx_chap_login', undef),
-      eqlx_chap_password  => hiera('cinder::backend::eqlx::eqlx_san_password', undef),
-    }
-  }
-
-  if hiera('cinder_enable_dellsc_backend', false) {
-    $cinder_dellsc_backend = hiera('cinder::backend::dellsc_iscsi::volume_backend_name')
-
-    cinder::backend::dellsc_iscsi{ $cinder_dellsc_backend :
-      volume_backend_name   => hiera('cinder::backend::dellsc_iscsi::volume_backend_name', undef),
-      san_ip                => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
-      san_login             => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
-      san_password          => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
-      dell_sc_ssn           => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
-      iscsi_ip_address      => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
-      iscsi_port            => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
-      dell_sc_api_port      => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
-      dell_sc_server_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
-      dell_sc_volume_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
-    }
-  }
-
-  if hiera('cinder_enable_netapp_backend', false) {
-    $cinder_netapp_backend = hiera('cinder::backend::netapp::title')
-
-    if hiera('cinder::backend::netapp::nfs_shares', undef) {
-      $cinder_netapp_nfs_shares = split(hiera('cinder::backend::netapp::nfs_shares', undef), ',')
-    }
-
-    cinder::backend::netapp { $cinder_netapp_backend :
-      netapp_login                 => hiera('cinder::backend::netapp::netapp_login', undef),
-      netapp_password              => hiera('cinder::backend::netapp::netapp_password', undef),
-      netapp_server_hostname       => hiera('cinder::backend::netapp::netapp_server_hostname', undef),
-      netapp_server_port           => hiera('cinder::backend::netapp::netapp_server_port', undef),
-      netapp_size_multiplier       => hiera('cinder::backend::netapp::netapp_size_multiplier', undef),
-      netapp_storage_family        => hiera('cinder::backend::netapp::netapp_storage_family', undef),
-      netapp_storage_protocol      => hiera('cinder::backend::netapp::netapp_storage_protocol', undef),
-      netapp_transport_type        => hiera('cinder::backend::netapp::netapp_transport_type', undef),
-      netapp_vfiler                => hiera('cinder::backend::netapp::netapp_vfiler', undef),
-      netapp_volume_list           => hiera('cinder::backend::netapp::netapp_volume_list', undef),
-      netapp_vserver               => hiera('cinder::backend::netapp::netapp_vserver', undef),
-      netapp_partner_backend_name  => hiera('cinder::backend::netapp::netapp_partner_backend_name', undef),
-      nfs_shares                   => $cinder_netapp_nfs_shares,
-      nfs_shares_config            => hiera('cinder::backend::netapp::nfs_shares_config', undef),
-      netapp_copyoffload_tool_path => hiera('cinder::backend::netapp::netapp_copyoffload_tool_path', undef),
-      netapp_controller_ips        => hiera('cinder::backend::netapp::netapp_controller_ips', undef),
-      netapp_sa_password           => hiera('cinder::backend::netapp::netapp_sa_password', undef),
-      netapp_storage_pools         => hiera('cinder::backend::netapp::netapp_storage_pools', undef),
-      netapp_eseries_host_type     => hiera('cinder::backend::netapp::netapp_eseries_host_type', undef),
-      netapp_webservice_path       => hiera('cinder::backend::netapp::netapp_webservice_path', undef),
-    }
-  }
-
-  if hiera('cinder_enable_nfs_backend', false) {
-    $cinder_nfs_backend = 'tripleo_nfs'
-
-    if str2bool($::selinux) {
-      selboolean { 'virt_use_nfs':
-        value      => on,
-        persistent => true,
-      } -> Package['nfs-utils']
-    }
-
-    package { 'nfs-utils': } ->
-    cinder::backend::nfs { $cinder_nfs_backend:
-      nfs_servers       => hiera('cinder_nfs_servers'),
-      nfs_mount_options => hiera('cinder_nfs_mount_options',''),
-      nfs_shares_config => '/etc/cinder/shares-nfs.conf',
-    }
-  }
-
-  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_eqlx_backend, $cinder_dellsc_backend, $cinder_netapp_backend, $cinder_nfs_backend])
-  class { '::cinder::backends' :
-    enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
-  }
-
-  class { '::sahara':
-    sync_db => $sync_db,
-  }
-  class { '::sahara::service::api':
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::sahara::service::engine':
-    manage_service => false,
-    enabled        => false,
   }
 
   # swift storage
@@ -792,7 +509,7 @@ MYSQL_HOST=localhost\n",
 
   # Aodh
   class { '::aodh' :
-    database_connection => $ceilometer_database_connection,
+    database_connection => hiera('aodh_mysql_conn_string'),
   }
   include ::aodh::config
   include ::aodh::auth
@@ -889,14 +606,10 @@ password=\"${mysql_root_password}\"",
   }
 
   $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-  $cinder_enable_db_purge = hiera('cinder_enable_db_purge', true)
 
   if $nova_enable_db_purge {
     include ::nova::cron::archive_deleted_rows
   }
-  if $cinder_enable_db_purge {
-    include ::cinder::cron::db_purge
-  }
 
   if $pacemaker_master {
 
@@ -919,139 +632,11 @@ password=\"${mysql_root_password}\"",
                           Pacemaker::Resource::Ocf['openstack-core']],
     }
 
-    # Cinder
-    pacemaker::resource::service { $::cinder::params::api_service :
-      clone_params => 'interleave=true',
-      require      => Pacemaker::Resource::Ocf['openstack-core'],
-    }
-    pacemaker::resource::service { $::cinder::params::scheduler_service :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::resource::service { $::cinder::params::volume_service : }
-
-    pacemaker::constraint::base { 'keystone-then-cinder-api-constraint':
-      constraint_type => 'order',
-      first_resource  => 'openstack-core-clone',
-      second_resource => "${::cinder::params::api_service}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Ocf['openstack-core'],
-                          Pacemaker::Resource::Service[$::cinder::params::api_service]],
-    }
-    pacemaker::constraint::base { 'cinder-api-then-cinder-scheduler-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::cinder::params::api_service}-clone",
-      second_resource => "${::cinder::params::scheduler_service}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::cinder::params::api_service],
-                          Pacemaker::Resource::Service[$::cinder::params::scheduler_service]],
-    }
-    pacemaker::constraint::colocation { 'cinder-scheduler-with-cinder-api-colocation':
-      source  => "${::cinder::params::scheduler_service}-clone",
-      target  => "${::cinder::params::api_service}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::cinder::params::api_service],
-                  Pacemaker::Resource::Service[$::cinder::params::scheduler_service]],
-    }
-    pacemaker::constraint::base { 'cinder-scheduler-then-cinder-volume-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::cinder::params::scheduler_service}-clone",
-      second_resource => $::cinder::params::volume_service,
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service],
-                          Pacemaker::Resource::Service[$::cinder::params::volume_service]],
-    }
-    pacemaker::constraint::colocation { 'cinder-volume-with-cinder-scheduler-colocation':
-      source  => $::cinder::params::volume_service,
-      target  => "${::cinder::params::scheduler_service}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::cinder::params::scheduler_service],
-                  Pacemaker::Resource::Service[$::cinder::params::volume_service]],
-    }
-
-    # Sahara
-    pacemaker::resource::service { $::sahara::params::api_service_name :
-      clone_params => 'interleave=true',
-      require      => Pacemaker::Resource::Ocf['openstack-core'],
-    }
-    pacemaker::resource::service { $::sahara::params::engine_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::constraint::base { 'keystone-then-sahara-api-constraint':
-      constraint_type => 'order',
-      first_resource  => 'openstack-core-clone',
-      second_resource => "${::sahara::params::api_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
-                          Pacemaker::Resource::Ocf['openstack-core']],
-    }
-    pacemaker::constraint::base { 'sahara-api-then-sahara-engine-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::sahara::params::api_service_name}-clone",
-      second_resource => "${::sahara::params::engine_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
-                          Pacemaker::Resource::Service[$::sahara::params::engine_service_name]],
-    }
-
-    if hiera('neutron::enable_ovs_agent', true) {
-      pacemaker::resource::service { $::neutron::params::ovs_agent_service:
-        clone_params => 'interleave=true',
-      }
-    }
     if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
       pacemaker::resource::service {'tomcat':
         clone_params => 'interleave=true',
       }
     }
-    if hiera('neutron::enable_ovs_agent', true) {
-      pacemaker::resource::ocf { $::neutron::params::ovs_cleanup_service:
-        ocf_agent_name => 'neutron:OVSCleanup',
-        clone_params   => 'interleave=true',
-      }
-      pacemaker::resource::ocf { 'neutron-netns-cleanup':
-        ocf_agent_name => 'neutron:NetnsCleanup',
-        clone_params   => 'interleave=true',
-      }
-
-      # neutron - one chain ovs-cleanup-->netns-cleanup-->ovs-agent
-      pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint':
-        constraint_type => 'order',
-        first_resource  => "${::neutron::params::ovs_cleanup_service}-clone",
-        second_resource => 'neutron-netns-cleanup-clone',
-        first_action    => 'start',
-        second_action   => 'start',
-        require         => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service],
-                            Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
-      }
-      pacemaker::constraint::colocation { 'neutron-ovs-cleanup-to-netns-cleanup-colocation':
-        source  => 'neutron-netns-cleanup-clone',
-        target  => "${::neutron::params::ovs_cleanup_service}-clone",
-        score   => 'INFINITY',
-        require => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service],
-                    Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
-      }
-      pacemaker::constraint::base { 'neutron-netns-cleanup-to-openvswitch-agent-constraint':
-        constraint_type => 'order',
-        first_resource  => 'neutron-netns-cleanup-clone',
-        second_resource => "${::neutron::params::ovs_agent_service}-clone",
-        first_action    => 'start',
-        second_action   => 'start',
-        require         => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'],
-                            Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
-      }
-      pacemaker::constraint::colocation { 'neutron-netns-cleanup-to-openvswitch-agent-colocation':
-        source  => "${::neutron::params::ovs_agent_service}-clone",
-        target  => 'neutron-netns-cleanup-clone',
-        score   => 'INFINITY',
-        require => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'],
-                    Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
-      }
-    }
     if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
       #midonet-chain chain keystone-->neutron-server-->dhcp-->metadata->tomcat
       pacemaker::constraint::base { 'neutron-server-to-dhcp-agent-constraint':
@@ -1091,23 +676,6 @@ password=\"${mysql_root_password}\"",
     }
 
     # Nova
-    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'],
-    }
-    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',
       first_resource  => 'openstack-core-clone',
@@ -1117,6 +685,13 @@ password=\"${mysql_root_password}\"",
       require         => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name],
                           Pacemaker::Resource::Ocf['openstack-core']],
     }
+    pacemaker::constraint::colocation { 'nova-consoleauth-with-openstack-core':
+      source  => "${::nova::params::consoleauth_service_name}-clone",
+      target  => 'openstack-core-clone',
+      score   => 'INFINITY',
+      require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name],
+                  Pacemaker::Resource::Ocf['openstack-core']],
+    }
     pacemaker::constraint::base { 'nova-consoleauth-then-nova-vncproxy-constraint':
       constraint_type => 'order',
       first_resource  => "${::nova::params::consoleauth_service_name}-clone",