Merge "Fixing detached cinder-volume role"
diff --git a/README.rst b/README.rst
index 3dd21a6..e189dfd 100644
--- a/README.rst
+++ b/README.rst
@@ -303,11 +303,11 @@
- 172.18.1.2:/vol_2
- 172.18.1.2:/vol_3
- 172.18.1.2:/vol_4
- compute:
- backend:
- netapp:
- engine: netapp
- storage_protocol: nfs
+ linux:
+ system:
+ package:
+ nfs-common:
+ version: latest
Cinder setup with Hitachi VPS
diff --git a/cinder/compute.sls b/cinder/compute.sls
deleted file mode 100644
index bcede64..0000000
--- a/cinder/compute.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-{%- from "cinder/map.jinja" import compute with context %}
-{%- if compute.get('enabled', False) %}
-
-include:
-- cinder.user
-
-{%- for backend_name, backend in compute.get('backend', {}).iteritems() %}
-
-{%- if backend.engine is defined and backend.engine == 'nfs' or (backend.engine == 'netapp' and backend.storage_protocol == 'nfs') %}
-
-cinder_netapp_compute_packages:
- pkg.installed:
- - pkgs:
- - nfs-common
-
-{%- endif %}
-
-{%- endfor %}
-
-{%- endif %}
diff --git a/cinder/init.sls b/cinder/init.sls
index 9a15d91..6f16b57 100644
--- a/cinder/init.sls
+++ b/cinder/init.sls
@@ -3,9 +3,6 @@
{% if pillar.cinder.controller is defined %}
- cinder.controller
{% endif %}
-{% if pillar.cinder.compute is defined %}
-- cinder.compute
-{% endif %}
{% if pillar.cinder.volume is defined %}
- cinder.volume
{% endif %}
diff --git a/cinder/map.jinja b/cinder/map.jinja
index 0755d54..fec426d 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -65,36 +65,3 @@
},
}, merge=pillar.cinder.get('volume', {})) %}
-{% set compute = salt['grains.filter_by']({
- 'Debian': {
- 'pkgs': [],
- 'services': [],
- 'wipe_method': 'none',
- 'notification': False,
- 'cors': {},
- 'audit': {
- 'enabled': false
- },
- 'backup': {
- 'pkgs': [],
- 'services': [],
- 'engine': None
- }
- },
- 'RedHat': {
- 'pkgs': [],
- 'services': [],
- 'wipe_method': 'none',
- 'notification': False,
- 'cors': {},
- 'audit': {
- 'enabled': false
- },
- 'backup': {
- 'pkgs': [],
- 'services': [],
- 'engine': None
- }
-
- },
-}, merge=pillar.cinder.get('compute', {})) %}
diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml
deleted file mode 100644
index 097e874..0000000
--- a/metadata/service/compute/single.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-applications:
-- cinder
-classes:
-- service.cinder.support
-parameters:
- cinder:
- compute:
- enabled: true
diff --git a/tests/pillar/netapp.sls b/tests/pillar/netapp.sls
index 7a7baa0..7746433 100644
--- a/tests/pillar/netapp.sls
+++ b/tests/pillar/netapp.sls
@@ -22,10 +22,8 @@
volume:
enabled: true
version: mitaka
- compute:
- enabled: true
- version: mitaka
- backend:
- netapp:
- engine: netapp
- storage_protocol: nfs
+linux:
+ system:
+ package:
+ nfs-common:
+ version: latest