openstack/fuel-library
Code Issues Proposed changes

Fix problem with deploy cinder-vmware role

Browse Source 
The role cinder is "upstream" for the role cinder-vmware
which depend on it. Cinder was changed and cinder-vmware
should be changed after that.

Change-Id: I97c9d32d93fc3bb47a655be5a1cec69216b55f8f
Closes-bug: 1433201
This commit is contained in:
Igor Gajsin 2015-03-31 11:19:23 +03:00
parent 80e358d511
commit 201fd44234
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp
View File

@ -32,7 +32,7 @@ $amqp_hosts = inline_template("<%= @amqp_nodes.map {|x| x + ':' + @amqp_port}.jo
# Determine who should get the volume service # Determine who should get the volume service
if (member($roles, 'cinder') and $storage_hash['volumes_lvm']) { if (member($roles, 'cinder') and $storage_hash['volumes_lvm']) {
$manage_volumes = 'iscsi' $manage_volumes = 'iscsi'
} elsif (member($roles, 'cinder') and $storage_hash['volumes_vmdk']) { } elsif member($roles, 'cinder-vmware') {
$manage_volumes = 'vmdk' $manage_volumes = 'vmdk'
} elsif ($storage_hash['volumes_ceph']) { } elsif ($storage_hash['volumes_ceph']) {
$manage_volumes = 'ceph' $manage_volumes = 'ceph'

2
deployment/puppet/osnailyfacter/modular/openstack-cinder/tasks.yaml
View File

@ -1,6 +1,6 @@
- id: openstack-cinder - id: openstack-cinder
type: puppet type: puppet
groups: [primary-controller, controller] groups: [primary-controller, controller, cinder-vmware]
required_for: [deploy_end, openstack-controller] required_for: [deploy_end, openstack-controller]
requires: [rabbitmq, keystone] requires: [rabbitmq, keystone]
parameters: parameters:

2
deployment/puppet/osnailyfacter/modular/vmware/tasks.yaml
View File

@ -13,7 +13,7 @@
type: puppet type: puppet
groups: [cinder-vmware] groups: [cinder-vmware]
required_for: [deploy_end] required_for: [deploy_end]
requires: [top-role-cinder] requires: [top-role-cinder, openstack-cinder]
condition: "settings:common.libvirt_type.value == 'vcenter' or settings:common.use_vcenter.value == true" condition: "settings:common.libvirt_type.value == 'vcenter' or settings:common.use_vcenter.value == true"
parameters: parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/vmware/cinder-vmware.pp puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/vmware/cinder-vmware.pp

8
deployment/puppet/vmware/manifests/cinder/vmdk.pp
View File

@ -115,14 +115,6 @@ define vmware::cinder::vmdk(
} }
} }
$upstart_link = "/etc/init.d/${cinder_volume_vmware}-${index}"
if ! defined(File[$upstart_link]) {
file { $upstart_link:
ensure => link,
target => '/etc/init.d/cinder-volume'
}
}
$init_reload_cmd = '/sbin/initctl reload-configuration' $init_reload_cmd = '/sbin/initctl reload-configuration'
$init_reload = 'initctl reload-configuration' $init_reload = 'initctl reload-configuration'
if ! defined(Exec[$init_reload]) { if ! defined(Exec[$init_reload]) {