stackforge/puppet-openstack
Code Issues Proposed changes

Fix references to nova-volume

Browse Source 
Also fixes an incorrect reference to iscsi_ip_address

Change-Id: Ib4a5ffece050f1e83573802bcd465d3b5a91b197
This commit is contained in:
Logan McNaughton
2013-05-11 20:34:53 -06:00
committed by Joe Topjian
parent 54275282ae
commit f3cb8e4671
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -61,8 +61,8 @@ These modules are based on the [openstack documentation](http://docs.openstack.o
### Volumes:
Every node that is configured to be a nova volume service must have a volume
group called `nova-volumes`.
Every node that is configured to be a cinder volume service must have a volume
group called `cinder-volumes`.
### Compute nodes

2
examples/site.pp
View File

@@ -145,7 +145,7 @@ node /openstack_compute/ {
vnc_enabled => true,
verbose => $verbose,
manage_volumes => true,
nova_volume => 'nova-volumes'
volume_group => 'cinder-volumes'
}
}

4
manifests/all.pp
View File

@@ -33,7 +33,7 @@
# [verbose] If the services should log verbosely. Optional. Defaults to false.
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true.
# [libvirt_type] The virualization type being controlled by libvirt. Optional. Defaults to 'kvm'.
# [nova_volume] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'nova-volumes'.
# [volume_group] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'cinder-volumes'.
# [horizon] (bool) is horizon installed. Defaults to: true
# === Examples
#
@@ -350,7 +350,7 @@ class openstack::all (
class { 'cinder::volume': }
class { 'cinder::volume::iscsi':
iscsi_ip_address => '127.0.0.1',
volume_group => $nova_volume,
volume_group => $volume_group,
}
} else {
# Set up nova-volume

2
manifests/cinder.pp
View File

@@ -2,7 +2,7 @@ class openstack::cinder(
$sql_connection,
$rabbit_password,
$rabbit_host = '127.0.0.1',
$volume_group = 'nova-volumes',
$volume_group = 'cinder-volumes',
$enabled = true
) {

6
manifests/compute.pp
View File

@@ -57,7 +57,7 @@ class openstack::compute (
$cinder = true,
$cinder_sql_connection = undef,
$manage_volumes = true,
$nova_volume = 'cinder-volumes',
$volume_group = 'cinder-volumes',
$iscsi_ip_address = '127.0.0.1',
# General
$migration_support = false,
@@ -208,8 +208,8 @@ class openstack::compute (
}
class { 'cinder::volume': }
class { 'cinder::volume::iscsi':
iscsi_ip_address => $internal_address,
volume_group => $nova_volume,
iscsi_ip_address => $iscsi_ip_address,
volume_group => $volume_group,
}
# set in nova::api