stackforge/cinder-salt-formula
Code Issues Proposed changes

add cinder db sync & remove cinder-backup

Browse Source
This commit is contained in:
Lei Zhang 2014-07-24 16:17:39 +08:00
parent 74c4131335
commit 2c7675b0c7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/map.jinja
View File

@ -1,8 +1,8 @@
{% set cinder=salt["grains.filter_by"]({ {% set cinder=salt["grains.filter_by"]({
"Debian":{ "Debian":{
"name": "cinder", "name": "cinder",
"server_pkgs": ["cinder-api", "cinder-scheduler", "cinder-backup"], "server_pkgs": ["cinder-api", "cinder-scheduler", "cinder-backup", "python-cinderclient"],
"server_services": ["cinder-api", "cinder-scheduler", "cinder-backup"], "server_services": ["cinder-api", "cinder-scheduler"],
"client_pkg": "python-cinderclient", "client_pkg": "python-cinderclient",
"cinder_volume": "cinder-volume", "cinder_volume": "cinder-volume",
"cinder_volume_service": "cinder-volume", "cinder_volume_service": "cinder-volume",
@ -10,7 +10,7 @@
"RedHat":{ "RedHat":{
"name": "cinder", "name": "cinder",
"server_pkgs": ["openstack-cinder"], "server_pkgs": ["openstack-cinder"],
"server_services": ["openstack-cinder-api", "openstack-cinder-scheduler", "openstack-cinder-backup"], "server_services": ["openstack-cinder-api", "openstack-cinder-scheduler"],
"client_pkg": "python-cinderclient", "client_pkg": "python-cinderclient",
"cinder_volume": "openstack-cinder", "cinder_volume": "openstack-cinder",
"cinder_volume_service": "openstack-cinder-volume", "cinder_volume_service": "openstack-cinder-volume",

6
cinder/server.sls
View File

@ -17,3 +17,9 @@ include:
- file: /etc/cinder/cinder.conf - file: /etc/cinder/cinder.conf
- watch: - watch:
- file: /etc/cinder/cinder.conf - file: /etc/cinder/cinder.conf
{{ cinder.name }}_sync_db:
cmd.run:
- name: cinder-manage db sync
- require:
- file: /etc/cinder/cinder.conf