drop suse supprot in the devstack plugin
suse has not been a testing runtime for a few releases and we have no jobs currently validating it still work. this change just removes the suse specific logic Change-Id: I357fa71704af7aa6239054ede29d0fdcdc3fb8b5
This commit is contained in:
@@ -57,12 +57,7 @@ fi
|
|||||||
|
|
||||||
WATCHER_UWSGI=watcher.wsgi.api:application
|
WATCHER_UWSGI=watcher.wsgi.api:application
|
||||||
WATCHER_UWSGI_CONF=$WATCHER_CONF_DIR/watcher-uwsgi.ini
|
WATCHER_UWSGI_CONF=$WATCHER_CONF_DIR/watcher-uwsgi.ini
|
||||||
|
WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/var/www/watcher}
|
||||||
if is_suse; then
|
|
||||||
WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/srv/www/htdocs/watcher}
|
|
||||||
else
|
|
||||||
WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/var/www/watcher}
|
|
||||||
fi
|
|
||||||
# Public facing bits
|
# Public facing bits
|
||||||
WATCHER_SERVICE_HOST=${WATCHER_SERVICE_HOST:-$SERVICE_HOST}
|
WATCHER_SERVICE_HOST=${WATCHER_SERVICE_HOST:-$SERVICE_HOST}
|
||||||
WATCHER_SERVICE_PORT=${WATCHER_SERVICE_PORT:-9322}
|
WATCHER_SERVICE_PORT=${WATCHER_SERVICE_PORT:-9322}
|
||||||
@@ -168,7 +163,7 @@ function create_watcher_conf {
|
|||||||
configure_keystone_authtoken_middleware $WATCHER_CONF watcher
|
configure_keystone_authtoken_middleware $WATCHER_CONF watcher
|
||||||
configure_keystone_authtoken_middleware $WATCHER_CONF watcher "watcher_clients_auth"
|
configure_keystone_authtoken_middleware $WATCHER_CONF watcher "watcher_clients_auth"
|
||||||
|
|
||||||
if is_fedora || is_suse; then
|
if is_fedora; then
|
||||||
# watcher defaults to /usr/local/bin, but fedora and suse pip like to
|
# watcher defaults to /usr/local/bin, but fedora and suse pip like to
|
||||||
# install things in /usr/bin
|
# install things in /usr/bin
|
||||||
iniset $WATCHER_CONF DEFAULT bindir "/usr/bin"
|
iniset $WATCHER_CONF DEFAULT bindir "/usr/bin"
|
||||||
|
Reference in New Issue
Block a user