diff --git a/devstack/lib/watcher b/devstack/lib/watcher index 2baf4f561..0d9e07355 100644 --- a/devstack/lib/watcher +++ b/devstack/lib/watcher @@ -57,12 +57,7 @@ fi WATCHER_UWSGI=watcher.wsgi.api:application WATCHER_UWSGI_CONF=$WATCHER_CONF_DIR/watcher-uwsgi.ini - -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 +WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/var/www/watcher} # Public facing bits WATCHER_SERVICE_HOST=${WATCHER_SERVICE_HOST:-$SERVICE_HOST} 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 "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 # install things in /usr/bin iniset $WATCHER_CONF DEFAULT bindir "/usr/bin"