openstack
/
tripleo-image-elements
Code Issues Proposed changes

Add svc-map to cinder-api 

This patch integrates svc-map into the cinder-api element
by adding a svc-map yaml file and updating os-svc-* calls
to use the -a option so svc-map is called instead of
map-services.  Please see the svc-map integration commit[1]
for more information on implementation details as needed.

[1] I382631746e458f2f8603a7dcf5221a21f4b53255

Change-Id: Ib3bc5c47de1b8bb6006530d56e9d47c3763af7b5
This commit is contained in:
Ryan Brady 2014-07-02 09:45:26 -04:00
parent d94a7abf27
commit deb30d1a35
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/cinder-api/install.d/cinder-source-install/73-cinder-api
View File

@ -3,5 +3,5 @@ set -eux
ln -s $CINDER_VENV_DIR/bin/cinder-manage /usr/local/bin/cinder-manage
os-svc-daemon -i "$CINDER_VENV_DIR" cinder-api cinder cinder-api "--config-dir /etc/cinder"
os-svc-daemon -i "$CINDER_VENV_DIR" cinder-scheduler cinder cinder-scheduler "--config-dir /etc/cinder"
os-svc-daemon -a -i "$CINDER_VENV_DIR" cinder-api cinder cinder-api "--config-dir /etc/cinder"
os-svc-daemon -a -i "$CINDER_VENV_DIR" cinder-scheduler cinder cinder-scheduler "--config-dir /etc/cinder"

8
elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -eu
os-svc-enable -n cinder-api
os-svc-enable -n cinder-scheduler
os-svc-restart -n cinder-api
os-svc-restart -n cinder-scheduler
os-svc-enable -an cinder-api
os-svc-enable -an cinder-scheduler
os-svc-restart -an cinder-api
os-svc-restart -an cinder-scheduler

6
elements/cinder-api/svc-map Normal file
View File

@ -0,0 +1,6 @@
cinder-api:
default: openstack-cinder-api
debian: cinder-api
cinder-scheduler:
default: openstack-cinder-scheduler
debian: cinder-scheduler