devstack: strip obsolete part of m-shr instumentation

The standard way of running services in screen windows
is the

$ cd $<SERVICE>_DIR && <SERVICE_CMD> --config-file $<SERVICE>_CONF

In case of the m-shr window (manila-share service) this was prefixed
with some initialization command to work around some initialization
context issues.

That's not required anymore, as those were specific to the lvm
driver, and now Manila is configured with lvm as default.
(If someone wishes to use lvm s/he can be referred to the cinder-volume
service which exhibits an issue analogous to that of Manila's lvm).

So we can go back to the standard format.

Change-Id: Ie7b3f08d5efcd8571d108b99ed766f10771398a2
This commit is contained in:
Csaba Henk 2014-06-02 14:14:54 +02:00
parent f335f8accd
commit 1108a11d56

View File

@ -423,7 +423,7 @@ function start_manila {
fi
screen_it m-api "cd $MANILA_DIR && $MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF"
screen_it m-shr "sudo service $samba_daemon_name stop; devloop='sudo losetup -j ${SHARE_BACKING_FILE:-$DATA_DIR/${SHARE_GROUP}-backing-file}'; if [[ \$( \$devloop ) != *'/dev/loop'* ]]; then sudo losetup -f ${SHARE_BACKING_FILE:-$DATA_DIR/${SHARE_GROUP}-backing-file}; fi; cd $MANILA_DIR && $MANILA_BIN_DIR/manila-share --config-file $MANILA_CONF"
screen_it m-shr "cd $MANILA_DIR && $MANILA_BIN_DIR/manila-share --config-file $MANILA_CONF"
screen_it m-sch "cd $MANILA_DIR && $MANILA_BIN_DIR/manila-scheduler --config-file $MANILA_CONF"
# Start proxies if enabled