From 216e469a220177a6c9b9bcf4655bcc24331a1682 Mon Sep 17 00:00:00 2001
From: Vladimir Kuklin <vkuklin@mirantis.com>
Date: Tue, 6 Aug 2013 22:15:42 +0400
Subject: [PATCH] fix cinder and swift mount point

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

diff --git a/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp b/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
index a12012d91e..08969bb75c 100644
--- a/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
+++ b/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
@@ -58,6 +58,12 @@ else {
   $floating_ips_range = parsejson($floating_network_range)
 }
 
+if !$swift_partition
+{
+  $swift_partition = '/var/lib/glance/node'
+}
+
+
 ##CALCULATED PARAMETERS
 
 
@@ -234,7 +240,8 @@ class compact_controller (
     cinder_user_password          => $cinder_hash[user_password],
     cinder_iscsi_bind_addr        => $cinder_iscsi_bind_addr,
     cinder_db_password            => $cinder_hash[db_password],
-    manage_volumes                => false,
+    cinder_volume_group           => "cinder",
+    manage_volumes                => $is_cinder_node,
     galera_nodes                  => $controller_nodes,
     custom_mysql_setup_class      => $custom_mysql_setup_class,
     mysql_skip_name_resolve       => true,
@@ -294,7 +301,7 @@ class virtual_ips () {
       class { 'openstack::swift::storage_node':
         storage_type          => $swift_loopback,
         loopback_size         => '5243780',
-        storage_mnt_base_dir  => "/var/lib/glance/node",
+        storage_mnt_base_dir  => $swift_partition,
         storage_devices       => $mountpoints,
         swift_zone            => $swift_zone,
         swift_local_net_ip    => $storage_address,
@@ -374,6 +381,7 @@ class virtual_ips () {
         vncproxy_host          => $public_vip,
         verbose                => $verbose,
         debug                  => $debug,
+        cinder_volume_group    => "cinder",
         vnc_enabled            => true,
         manage_volumes         => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
         nova_user_password     => $nova_hash[user_password],
diff --git a/deployment/puppet/osnailyfacter/manifests/cluster_ha_full.pp b/deployment/puppet/osnailyfacter/manifests/cluster_ha_full.pp
index aaa87da191..e78821eb53 100644
--- a/deployment/puppet/osnailyfacter/manifests/cluster_ha_full.pp
+++ b/deployment/puppet/osnailyfacter/manifests/cluster_ha_full.pp
@@ -72,7 +72,10 @@ if !$debug
  $debug = 'true'
 }
 
-
+if !$swift_partition
+{
+  $swift_partition = '/srv/node'
+}
 
 
 ##CALCULATED PARAMETERS
@@ -244,6 +247,7 @@ class ha_controller (
     segment_range           => $segment_range,
     cinder                  => true,
     cinder_iscsi_bind_addr  => $cinder_iscsi_bind_addr,
+    cinder_volume_group     => "cinder",
     manage_volumes          => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
     galera_nodes            => $controller_nodes,
     custom_mysql_setup_class => $custom_mysql_setup_class,
@@ -345,6 +349,7 @@ case $role {
     segment_range          => $segment_range,
     cinder                 => $cinder,
     cinder_iscsi_bind_addr => $cinder_iscsi_bind_addr,
+    cinder_volume_group     => "cinder",
     manage_volumes         => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
     db_host                => $management_vip,
     cinder_rate_limits     => $::cinder_rate_limits,
@@ -368,13 +373,14 @@ case $role {
   class { 'openstack::swift::storage_node':
     storage_type          => $swift_loopback,
     loopback_size         => '5243780',
-    storage_mnt_base_dir  => "/var/lib/glance/node",
+    storage_mnt_base_dir  => $swift_partition,
     storage_devices       =>  $mountpoints,
     swift_zone             => $swift_zone,
     swift_local_net_ip     => $swift_local_net_ip,
     master_swift_proxy_ip  => $master_swift_proxy_ip,
     cinder                 => $cinder,
     cinder_iscsi_bind_addr => $cinder_iscsi_bind_addr,
+    cinder_volume_group     => "cinder",
     manage_volumes          => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
     db_host                => $management_vip,
     service_endpoint       => $management_vip,
diff --git a/deployment/puppet/osnailyfacter/manifests/cluster_simple.pp b/deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
index cc4e548440..28e4515c55 100644
--- a/deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
+++ b/deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
@@ -167,6 +167,7 @@ if !$debug
         cinder_user_password    => $cinder_hash[user_password],
         cinder_db_password      => $cinder_hash[db_password],
         cinder_iscsi_bind_addr  => $cinder_iscsi_bind_addr,
+        cinder_volume_group     => "cinder",
         manage_volumes          => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
         use_syslog              => true,
         syslog_log_level        => $syslog_log_level,
@@ -300,6 +301,7 @@ if !$debug
         cinder_user_password   => $cinder_hash[user_password],
         cinder_db_password     => $cinder_hash[db_password],
         cinder_iscsi_bind_addr  => $cinder_iscsi_bind_addr,
+        cinder_volume_group     => "cinder",
         manage_volumes          => $cinder ? { false => $manage_volumes, default =>$is_cinder_node },
         db_host                => $controller_node_address,
         verbose                => $verbose,