Merge "Fix problem with deploy cinder-vmware role"

deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp

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

deployment/puppet/osnailyfacter/modular/openstack-cinder/tasks.yaml

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

deployment/puppet/osnailyfacter/modular/vmware/tasks.yaml

@@ -13,7 +13,7 @@
   type: puppet
   groups: [cinder-vmware]
   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"
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/vmware/cinder-vmware.pp

deployment/puppet/vmware/manifests/cinder/vmdk.pp

@@ -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 = 'initctl reload-configuration'
       if ! defined(Exec[$init_reload]) {