openstack
/
fuel-library
Code Issues Proposed changes

Fix cinder-vmware deployment with ceph 

Fix cinder-vmware deployment with ceph

Change-Id: I306adbfae0d2df6a028322340c5d86bc580e70c8
Closes-bug: #1523914
This commit is contained in:
Alexander Arzhanov 2015-12-08 18:28:24 +03:00
parent 6a5f6c0afb
commit 3ddd369753
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/roles/cinder.pp
View File

@ -215,7 +215,7 @@ Exec { logoutput => true }
#################################################################
# we need to evaluate ceph here, because ceph notifies/requires
# other services that are declared in openstack manifests
if ($use_ceph and !$storage_hash['volumes_lvm']) {
if ($use_ceph and !$storage_hash['volumes_lvm'] and !member($roles, 'cinder-vmware')) {
$primary_mons = $controllers
$primary_mon = $controllers[0]['name']

2
tests/noop/spec/hosts/roles/cinder_spec.rb
View File

@ -7,7 +7,7 @@ describe manifest do
storage_hash = Noop.hiera 'storage_hash'
if Noop.hiera 'use_ceph' and !(storage_hash['volumes_lvm'])
if Noop.hiera 'use_ceph' and !(storage_hash['volumes_lvm']) and !(member($roles, 'cinder-vmware'))
it { should contain_class('ceph') }
end