Merge "SPM packaging metadata"
diff --git a/cinder/map.jinja b/cinder/map.jinja
index c231887..39bcb2e 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -1,7 +1,7 @@
{% set controller = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['cinder-api', 'cinder-scheduler', 'lvm2', 'python-cinder', 'gettext-base'],
+ 'pkgs': ['cinder-api', 'cinder-scheduler', 'lvm2', 'python-cinder', 'gettext-base', 'python-memcache'],
'services': ['cinder-api', 'cinder-scheduler'],
'wipe_method': 'none',
'notification': False,
@@ -16,7 +16,7 @@
{% set volume = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['cinder-volume', 'lvm2', 'sysfsutils', 'sg3-utils', 'python-cinder','python-mysqldb','p7zip', 'gettext-base'],
+ 'pkgs': ['cinder-volume', 'lvm2', 'sysfsutils', 'sg3-utils', 'python-cinder','python-mysqldb','p7zip', 'gettext-base', 'python-memcache'],
'services': ['cinder-volume'],
'wipe_method': 'none',
'notification': False,
@@ -27,4 +27,4 @@
'wipe_method': 'none',
'notification': False,
},
-}, merge=salt['pillar.get']('cinder:volume')) %}
\ No newline at end of file
+}, merge=salt['pillar.get']('cinder:volume')) %}
diff --git a/cinder/meta/salt.yml b/cinder/meta/salt.yml
new file mode 100644
index 0000000..b10f98d
--- /dev/null
+++ b/cinder/meta/salt.yml
@@ -0,0 +1,11 @@
+orchestrate:
+ controller:
+ priority: 540
+ batch: 1
+ require:
+ - salt: keystone.server
+ volume:
+ priority: 550
+ require:
+ - salt: cinder.controller
+