openstack
/
cyborg
Code Issues Proposed changes

Merge "bug fix: endpoint register, import and devstack broken issues."

This commit is contained in:
Zuul 2018-04-29 03:24:31 +00:00 committed by Gerrit Code Review
parent 801aad10a4 a308525d38
commit 0d2f38c435
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyborg/accelerator/drivers/generic_driver.py
View File

@ -17,7 +17,7 @@
Cyborg Generic driver implementation.
"""
from modules import generic
from cyborg.accelerator.drivers.modules import generic
from oslo_config import cfg
from oslo_log import log

3
cyborg/cmd/api.py
View File

@ -32,6 +32,5 @@ def main():
# Build and start the WSGI app
launcher = cyborg_service.process_launcher()
server = cyborg_service.WSGIService('cyborg_api', CONF.api.enable_ssl_api)
launcher.launch_service(server, workers=server.workers,
restart_method='mutate')
launcher.launch_service(server, workers=server.workers)
launcher.wait()

9
devstack/lib/cyborg
View File

@ -40,6 +40,7 @@ CYBORG_CONF_FILE=$CYBORG_CONF_DIR/cyborg.conf
CYBORG_ROOTWRAP_CONF=$CYBORG_CONF_DIR/rootwrap.conf
CYBORG_POLICY_JSON=$CYBORG_CONF_DIR/policy.json
CYBORG_SERVICE_HOST=${CYBORG_SERVICE_HOST:-$SERVICE_HOST}
CYBORG_SERVICE_PORT=${CYBORG_SERVICE_PORT:-6666}
CYBORG_SERVICE_PROTOCOL=${CYBORG_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
if [[ -d ${CYBORG_DIR}/bin ]]; then
CYBORG_BIN_DIR=${CYBORG_DIR}/bin
@ -99,12 +100,12 @@ function configure_cyborg_dirs {
# service cyborg admin
function create_cyborg_accounts {
create_service_user "cyborg" "admin"
get_or_create_service "cyborg" "cyborg" "Cyborg Accelerators Service"
get_or_create_service "cyborg" "acceleration" "Cyborg Accelerators Service"
get_or_create_endpoint "cyborg" \
"$REGION_NAME" \
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}/cyborg/v1" \
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}/cyborg/v1" \
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}/cyborg/v1"
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}:${CYBORG_SERVICE_PORT}/v1" \
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}:${CYBORG_SERVICE_PORT}/v1" \
"${CYBORG_SERVICE_PROTOCOL}://${CYBORG_SERVICE_HOST}:${CYBORG_SERVICE_PORT}/v1"
}