openstack
/
puppet-nova
Code Issues Proposed changes

Do not create nova-volume if cinder is enabled. Removed unused defined 

type.
This commit is contained in:
Joe Topjian 2012-10-24 11:22:16 -06:00
parent c7e794f4ab
commit b3cd9e5842
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/keystone/auth.pp
View File

@ -11,7 +11,8 @@ class nova::keystone::auth(
$volume_version = 'v1',
$region = 'RegionOne',
$tenant = 'services',
$email = 'nova@localhost'
$email = 'nova@localhost',
$cinder = false
) {
keystone_user { $auth_name:
@ -36,16 +37,18 @@ class nova::keystone::auth(
internal_url => "http://${internal_address}:${compute_port}/${compute_version}/%(tenant_id)s",
}
keystone_service { "${auth_name}_volume":
ensure => present,
type => 'volume',
description => 'Volume Service',
}
keystone_endpoint { "${region}/${auth_name}_volume":
ensure => present,
public_url => "http://${public_address}:${volume_port}/${volume_version}/%(tenant_id)s",
admin_url => "http://${admin_address}:${volume_port}/${volume_version}/%(tenant_id)s",
internal_url => "http://${internal_address}:${volume_port}/${volume_version}/%(tenant_id)s",
if $cinder == false {
keystone_service { "${auth_name}_volume":
ensure => present,
type => 'volume',
description => 'Volume Service',
}
keystone_endpoint { "${region}/${auth_name}_volume":
ensure => present,
public_url => "http://${public_address}:${volume_port}/${volume_version}/%(tenant_id)s",
admin_url => "http://${admin_address}:${volume_port}/${volume_version}/%(tenant_id)s",
internal_url => "http://${internal_address}:${volume_port}/${volume_version}/%(tenant_id)s",
}
}
keystone_service { "${auth_name}_ec2":

9
manifests/migration/libvirt.pp
View File

@ -1,14 +1,5 @@
class nova::migration::libvirt {
define replace($file, $orig, $new) {
exec { "Replace ${orig} with ${new} in ${file}":
path => ['/bin', '/usr/bin'],
command => "perl -p -i -e 's/^${orig}\$/${new}/g' ${file}",
unless => "grep -q '^${new}$' ${file}",
notify => Service['libvirt'],
}
}
case $::lsbdistid {
'Ubuntu': {
# Ubuntu-specific, not Debian, due to upstart