From b6f2da13178561870e27fa1d43b9d72d0548dd84 Mon Sep 17 00:00:00 2001
From: Dmitry Pyzhov <dpyzhov@mirantis.com>
Date: Fri, 21 Jun 2013 13:07:16 +0400
Subject: [PATCH] Set cinder=>true in puppet

---
 puppet/osnailyfacter/manifests/cluster_ha.pp     | 10 ++--------
 puppet/osnailyfacter/manifests/cluster_simple.pp | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/puppet/osnailyfacter/manifests/cluster_ha.pp b/puppet/osnailyfacter/manifests/cluster_ha.pp
index 44bf2f8ede..8e86c7e5b1 100644
--- a/puppet/osnailyfacter/manifests/cluster_ha.pp
+++ b/puppet/osnailyfacter/manifests/cluster_ha.pp
@@ -6,12 +6,6 @@ $controller_storage_addresses = parsejson($ctrl_storage_addresses)
 $controller_hostnames = keys($controller_internal_addresses)
 $controller_nodes = values($controller_internal_addresses)
 
-if $use_cinder == 'true' {
-  $bool_use_cinder = true
-} else {
-  $bool_use_cinder = false
-}
-
 if $auto_assign_floating_ip == 'true' {
   $bool_auto_assign_floating_ip = true
 } else {
@@ -130,7 +124,7 @@ class compact_controller {
     quantum_db_dbname             => $quantum_db_dbname,
     tenant_network_type           => $tenant_network_type,
     segment_range                 => $segment_range,
-    cinder                        => $bool_use_cinder,
+    cinder                        => true,
     cinder_user_password          => $cinder_hash[user_password],
     cinder_iscsi_bind_addr        => $internal_address,
     cinder_db_password            => $cinder_hash[db_password],
@@ -229,7 +223,7 @@ class compact_controller {
         nova_user_password     => $nova_hash[user_password],
         cache_server_ip        => $controller_nodes,
         service_endpoint       => $management_vip,
-        cinder                 => $bool_use_cinder,
+        cinder                 => true,
         cinder_iscsi_bind_addr => $internal_address,
         cinder_user_password   => $cinder_hash[user_password],
         cinder_db_password     => $cinder_hash[db_password],
diff --git a/puppet/osnailyfacter/manifests/cluster_simple.pp b/puppet/osnailyfacter/manifests/cluster_simple.pp
index a35a8e6031..aba13458c0 100644
--- a/puppet/osnailyfacter/manifests/cluster_simple.pp
+++ b/puppet/osnailyfacter/manifests/cluster_simple.pp
@@ -20,12 +20,6 @@ $access_hash   = parsejson($access)
 $extra_rsyslog_hash = parsejson($syslog)
 $floating_hash = parsejson($floating_network_range)
 
-if $use_cinder == 'true' {
-  $bool_use_cinder = true
-} else {
-  $bool_use_cinder = false
-}
-
 if $auto_assign_floating_ip == 'true' {
   $bool_auto_assign_floating_ip = true
 } else {
@@ -95,7 +89,7 @@ Exec { logoutput => true }
         rabbit_user             => $rabbit_user,
         export_resources        => false,
         quantum                 => $quantum,
-        cinder                  => $bool_use_cinder,
+        cinder                  => true,
         cinder_user_password    => $cinder_hash[user_password],
         cinder_db_password      => $cinder_hash[db_password],
         manage_volumes          => false,
@@ -173,7 +167,7 @@ Exec { logoutput => true }
         #quantum_user_password  => $quantum_user_password,
         #tenant_network_type    => $tenant_network_type,
         service_endpoint       => $controller_node_address,
-        cinder                 => $bool_use_cinder,
+        cinder                 => true,
         cinder_user_password   => $cinder_hash[user_password],
         cinder_db_password     => $cinder_hash[db_password],
         manage_volumes         => false,