Merge "Composable roles within services - NTP"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index f330820..0bee6b0 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -59,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 {
@@ -251,13 +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'],
-    }
-
     if downcase(hiera('ceilometer_backend')) == 'mysql' {
       class { '::ceilometer::db::mysql':
         require => Exec['galera-ready'],
@@ -353,7 +342,6 @@ MYSQL_HOST=localhost\n",
   }
 
   include ::nova::config
-  include ::nova::network::neutron
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
 
@@ -404,9 +392,6 @@ MYSQL_HOST=localhost\n",
 
   }
 
-  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
   }