Fixing detached cinder-volume role
If one deploys cinder-volume detached, netapp and
nfs drivers should be available.
Change-Id: I87c54b60a01c9117f0204aaf4c3cb5fcf9e22601
diff --git a/cinder/volume.sls b/cinder/volume.sls
index 15faf0f..ac54fb0 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -72,6 +72,24 @@
{%- for backend_name, backend in volume.get('backend', {}).iteritems() %}
+{%- if backend.engine is defined and backend.engine == 'nfs' or (backend.engine == 'netapp' and backend.storage_protocol == 'nfs') %}
+/etc/cinder/nfs_shares_{{ backend_name }}_for_cinder-volume:
+ file.managed:
+ - name: /etc/cinder/nfs_shares_{{ backend_name }}
+ - source: salt://cinder/files/{{ volume.version }}/nfs_shares
+ - defaults:
+ backend: {{ backend|yaml }}
+ - template: jinja
+ - require:
+ - pkg: cinder_volume_packages
+
+cinder_netapp_packages_for_cinder-volume:
+ pkg.installed:
+ - pkgs:
+ - nfs-common
+
+{%- endif %}
+
{%- if backend.engine in ['iscsi' , 'hp_lefthand'] %}
cinder_iscsi_packages_{{ loop.index }}: