From 4e803eeee379b79fff895d96a18e69584fff3656 Mon Sep 17 00:00:00 2001 From: Shaohe Feng Date: Thu, 29 Mar 2018 15:28:33 +0000 Subject: [PATCH] bug fix: devstack can not start cyborg Change-Id: I56eaa55c3c9c81695a4d47fe396c48d1efce0925 --- cyborg/__init__.py | 2 +- cyborg/accelerator/__init__.py | 2 +- cyborg/version.py | 2 +- devstack/lib/cyborg | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cyborg/__init__.py b/cyborg/__init__.py index 3056acfc..b882154a 100644 --- a/cyborg/__init__.py +++ b/cyborg/__init__.py @@ -17,6 +17,6 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'cyborg').version_string() + 'openstack-cyborg').version_string() eventlet.monkey_patch(os=False) diff --git a/cyborg/accelerator/__init__.py b/cyborg/accelerator/__init__.py index d0f34f07..96fc0fc6 100644 --- a/cyborg/accelerator/__init__.py +++ b/cyborg/accelerator/__init__.py @@ -16,4 +16,4 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'cyborg').version_string() + 'openstack-cyborg').version_string() diff --git a/cyborg/version.py b/cyborg/version.py index fd1dcdc6..00c46183 100644 --- a/cyborg/version.py +++ b/cyborg/version.py @@ -16,4 +16,4 @@ import pbr.version -version_info = pbr.version.VersionInfo('cyborg') +version_info = pbr.version.VersionInfo('openstack-cyborg') diff --git a/devstack/lib/cyborg b/devstack/lib/cyborg index b94dc287..f389eb09 100644 --- a/devstack/lib/cyborg +++ b/devstack/lib/cyborg @@ -113,7 +113,6 @@ function configure_cyborg { configure_cyborg_dirs # Copy over cyborg configuration file and configure common parameters. - cp $CYBORG_DIR/etc/cyborg/cyborg.conf.sample $CYBORG_CONF_FILE iniset $CYBORG_CONF_FILE DEFAULT debug True inicomment $CYBORG_CONF_FILE DEFAULT log_file iniset $CYBORG_CONF_FILE database connection `database_connection_url cyborg`