Remove usage of ::nova class in THT

The ::nova class definition is now done in puppet-tripleo.

Depends-On: Ie4e72e765f6a8ade48d4b2b766f067872554d1a2
Change-Id: Ic394e50aa2e288f12d7287a68ea5f691fb7ef07c

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 3778271..067207f 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -24,19 +24,6 @@ if hiera('step') >= 2 {
 } #END STEP 2
 
 if hiera('step') >= 4 {
-
-  $nova_ipv6 = hiera('nova::use_ipv6', false)
-  if $nova_ipv6 {
-    $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
-  } else {
-    $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
-  }
-
-  class { '::nova' :
-    memcached_servers => $memcached_servers
-  }
-  include ::nova::config
-
   # Aodh
   class { '::aodh' :
     database_connection => hiera('aodh_mysql_conn_string'),

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 6df1de2..709d996 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -43,19 +43,6 @@ if hiera('step') >= 2 {
 } #END STEP 2
 
 if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
-  $nova_ipv6 = hiera('nova::use_ipv6', false)
-  if $nova_ipv6 {
-    $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
-  } else {
-    $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
-  }
-
-  class { '::nova' :
-    memcached_servers => $memcached_servers
-  }
-
-  include ::nova::config
-
   # Aodh
   class { '::aodh' :
     database_connection => hiera('aodh_mysql_conn_string'),