Merge "Move nova constraints from controller manifest to each service"

1 files changed, 0 insertions, 82 deletions

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 9ebfb6d5..ca24c443 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -99,88 +99,6 @@ if hiera('step') >= 5 {
                           Pacemaker::Resource::Ocf['openstack-core']],
     }
 
-    # Nova
-    pacemaker::constraint::base { 'keystone-then-nova-consoleauth-constraint':
-      constraint_type => 'order',
-      first_resource  => 'openstack-core-clone',
-      second_resource => "${::nova::params::consoleauth_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      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",
-      second_resource => "${::nova::params::vncproxy_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name],
-                          Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name]],
-    }
-    pacemaker::constraint::colocation { 'nova-vncproxy-with-nova-consoleauth-colocation':
-      source  => "${::nova::params::vncproxy_service_name}-clone",
-      target  => "${::nova::params::consoleauth_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::nova::params::consoleauth_service_name],
-                  Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name]],
-    }
-    pacemaker::constraint::base { 'nova-vncproxy-then-nova-api-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::nova::params::vncproxy_service_name}-clone",
-      second_resource => "${::nova::params::api_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name],
-                          Pacemaker::Resource::Service[$::nova::params::api_service_name]],
-    }
-    pacemaker::constraint::colocation { 'nova-api-with-nova-vncproxy-colocation':
-      source  => "${::nova::params::api_service_name}-clone",
-      target  => "${::nova::params::vncproxy_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::nova::params::vncproxy_service_name],
-                  Pacemaker::Resource::Service[$::nova::params::api_service_name]],
-    }
-    pacemaker::constraint::base { 'nova-api-then-nova-scheduler-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::nova::params::api_service_name}-clone",
-      second_resource => "${::nova::params::scheduler_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::nova::params::api_service_name],
-                          Pacemaker::Resource::Service[$::nova::params::scheduler_service_name]],
-    }
-    pacemaker::constraint::colocation { 'nova-scheduler-with-nova-api-colocation':
-      source  => "${::nova::params::scheduler_service_name}-clone",
-      target  => "${::nova::params::api_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::nova::params::api_service_name],
-                  Pacemaker::Resource::Service[$::nova::params::scheduler_service_name]],
-    }
-    pacemaker::constraint::base { 'nova-scheduler-then-nova-conductor-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::nova::params::scheduler_service_name}-clone",
-      second_resource => "${::nova::params::conductor_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::nova::params::scheduler_service_name],
-                          Pacemaker::Resource::Service[$::nova::params::conductor_service_name]],
-    }
-    pacemaker::constraint::colocation { 'nova-conductor-with-nova-scheduler-colocation':
-      source  => "${::nova::params::conductor_service_name}-clone",
-      target  => "${::nova::params::scheduler_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::nova::params::scheduler_service_name],
-                  Pacemaker::Resource::Service[$::nova::params::conductor_service_name]],
-    }
-
     # Fedora doesn't know `require-all` parameter for constraints yet
     if $::operatingsystem == 'Fedora' {
       $redis_aodh_constraint_params = undef