openstack/puppet-nova
Code Issues Proposed changes

Merge pull request #214 from puppetlabs/folsom

Browse Source 
Folsom
This commit is contained in:
Dan Bode 2012-11-21 14:49:56 -08:00
commit 3bb769bd30
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network/bridge.pp
View File

@ -20,10 +20,10 @@ define nova::network::bridge ( $ip, $netmask = "255.255.255.0" )
}
}
'fedora' : {
'fedora', 'CentOS', 'RedHat' : {
}
default: { fail('nova::network_bridge currently only supports Debian and Ubuntu') }
default: { fail('nova::network_bridge currently only supports Debian, Ubuntu, Fedora, CentOS and RedHat') }
}
}

37
manifests/volume/san.pp Normal file
View File

@ -0,0 +1,37 @@
# Class: nova::volume::san
#
# This class assumes that you have already configured your
# volume group - either by another module or during the server
# provisioning
#
# SanISCSIDriver(nova.volume.driver.ISCSIDriver):
# SolarisISCSIDriver(SanISCSIDriver):
# HpSanISCSIDriver(SanISCSIDriver):
# SolidFireSanISCSIDriver(SanISCSIDriver):
#
class nova::volume::san (
$volume_driver = 'nova.volume.san.SolarisISCSIDriver',
$san_ip = '127.0.0.1',
$san_login = 'cluster_operator',
$san_password = '007',
$san_private_key = undef,
$san_clustername = 'storage_cluster'
) {
if $san_private_key {
nova_config { 'san_private_key': value => $san_private_key }
} else {
nova_config {
'san_login': value => $san_login;
'san_password': value => $san_password;
}
}
nova_config {
'volume_driver': value => $volume_driver;
'san_ip': value => $san_ip;
'san_clustername': value => $san_clustername;
}
}