summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPSTREAM4
-rw-r--r--devstack/README.rst12
-rw-r--r--tests/inspector.py3
-rwxr-xr-xtests/run.sh2
4 files changed, 15 insertions, 6 deletions
diff --git a/UPSTREAM b/UPSTREAM
index 2e04abde..de01cbfc 100644
--- a/UPSTREAM
+++ b/UPSTREAM
@@ -49,4 +49,6 @@
-
url: https://review.openstack.org/424340
system: Gerrit
- # WIP
+-
+ url: https://bugs.launchpad.net/python-openstackclient/+bug/1684989
+ system: Launchpad-bug
diff --git a/devstack/README.rst b/devstack/README.rst
index cd836f13..c55d5626 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -9,7 +9,7 @@ Enabling OPNFV Doctor using DevStack
This directory contains the files necessary to run OpenStack with enabled
OPNFV Doctor in DevStack.
-To configure DevStack to enable OPNFV Doctor edit
+1. To configure DevStack to enable OPNFV Doctor edit
``${DEVSTACK_DIR}/local.conf`` file and add::
enable_plugin aodh http://git.openstack.org/openstack/aodh
@@ -22,6 +22,14 @@ to the ``[[local|localrc]]`` section.
.. note:: The order of enabling plugins matters.
-Run DevStack as normal::
+2. To enable Python 3 in DevStack, please add::
+
+ USE_PYTHON3=True
+
+3. To enable Congress as Doctor Inspector, please also add::
+
+ enable_plugin congress https://git.openstack.org/openstack/congress
+
+4. Run DevStack as normal::
$ ./stack.sh
diff --git a/tests/inspector.py b/tests/inspector.py
index d11da299..a61051f1 100644
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -54,8 +54,7 @@ class DoctorInspectorSample(object):
# Pool of novaclients for redundant usage
for i in range(self.NUMBER_OF_CLIENTS):
self.novaclients.append(
- novaclient.Client(self.NOVA_API_VERSION, session=sess,
- connection_pool=True))
+ novaclient.Client(self.NOVA_API_VERSION, session=sess))
# Normally we use this client for non redundant API calls
self.nova=self.novaclients[0]
self.nova.servers.list(detailed=False)
diff --git a/tests/run.sh b/tests/run.sh
index fda1e753..b838adab 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -48,7 +48,7 @@ as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT
get_compute_host_info() {
# get computer host info which first VM boot in as admin user
COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 |
- grep "OS-EXT-SRV-ATTR:host" | awk '{ print $4 }')
+ grep "OS-EXT-SRV-ATTR:host " | awk '{ print $4 }')
compute_host_in_undercloud=${COMPUTE_HOST%%.*}
die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname"