aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-06-06 11:21:40 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-29 21:38:25 +0000
commitb9d062c3480ba2368fc5738d9240bdf54fead72d (patch)
tree0a71f797694b1bb174c5aa594eec5221703b51b2 /puppet
parent03fbc98601a96c6bd51915a25ac1f73cbc53239c (diff)
Remove usage of ::nova class in THT
The ::nova class definition is now done in puppet-tripleo. Depends-On: Ie4e72e765f6a8ade48d4b2b766f067872554d1a2 Change-Id: Ic394e50aa2e288f12d7287a68ea5f691fb7ef07c
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller.pp13
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp13
2 files changed, 0 insertions, 26 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 3778271c..067207f2 100644
--- 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 6df1de20..709d9968 100644
--- 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'),