From 2c7675b0c7d9cef52f307f2b8615174913a97403 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Jul 2014 16:17:39 +0800 Subject: [PATCH] add cinder db sync & remove cinder-backup --- cinder/map.jinja | 6 +++--- cinder/server.sls | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cinder/map.jinja b/cinder/map.jinja index 359a1a9..c082913 100644 --- a/cinder/map.jinja +++ b/cinder/map.jinja @@ -1,8 +1,8 @@ {% set cinder=salt["grains.filter_by"]({ "Debian":{ "name": "cinder", - "server_pkgs": ["cinder-api", "cinder-scheduler", "cinder-backup"], - "server_services": ["cinder-api", "cinder-scheduler", "cinder-backup"], + "server_pkgs": ["cinder-api", "cinder-scheduler", "cinder-backup", "python-cinderclient"], + "server_services": ["cinder-api", "cinder-scheduler"], "client_pkg": "python-cinderclient", "cinder_volume": "cinder-volume", "cinder_volume_service": "cinder-volume", @@ -10,7 +10,7 @@ "RedHat":{ "name": "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", "cinder_volume": "openstack-cinder", "cinder_volume_service": "openstack-cinder-volume", diff --git a/cinder/server.sls b/cinder/server.sls index c203824..07c303f 100644 --- a/cinder/server.sls +++ b/cinder/server.sls @@ -17,3 +17,9 @@ include: - file: /etc/cinder/cinder.conf - watch: - file: /etc/cinder/cinder.conf + +{{ cinder.name }}_sync_db: + cmd.run: + - name: cinder-manage db sync + - require: + - file: /etc/cinder/cinder.conf