openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use manage_volume_type option to manage cinder volume type"

Browse Source
This commit is contained in:
Jenkins 2016-11-22 03:00:12 +00:00 committed by Gerrit Code Review
commit 0e55bc8a10
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/cinder.pp
View File

@ -117,6 +117,7 @@ class openstack_integration::cinder (
} }
cinder::backend::iscsi { 'BACKEND_1': cinder::backend::iscsi { 'BACKEND_1':
iscsi_ip_address => '127.0.0.1', iscsi_ip_address => '127.0.0.1',
manage_volume_type => true,
} }
} }
'rbd': { 'rbd': {
@ -124,6 +125,7 @@ class openstack_integration::cinder (
rbd_user => 'openstack', rbd_user => 'openstack',
rbd_pool => 'cinder', rbd_pool => 'cinder',
rbd_secret_uuid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c', rbd_secret_uuid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
manage_volume_type => true,
} }
# make sure ceph pool exists before running Cinder API & Volume # make sure ceph pool exists before running Cinder API & Volume
Exec['create-cinder'] -> Service['httpd'] Exec['create-cinder'] -> Service['httpd']
@ -136,10 +138,6 @@ class openstack_integration::cinder (
class { '::cinder::backends': class { '::cinder::backends':
enabled_backends => ['BACKEND_1'], enabled_backends => ['BACKEND_1'],
} }
cinder_type { 'BACKEND_1':
ensure => present,
properties => ['volume_backend_name=BACKEND_1'],
}
if $cinder_backup == swift { if $cinder_backup == swift {
include ::cinder::backup include ::cinder::backup