openstack
/
fuel-library
Code Issues Proposed changes

fix cinder and swift mount point

This commit is contained in:
Vladimir Kuklin 2013-08-06 22:15:42 +04:00
parent 89f6752bf8
commit 216e469a22
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -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],

10
deployment/puppet/osnailyfacter/manifests/cluster_ha_full.pp
View File

@ -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,

2
deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -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,