Merge "Fix host status grep bug and Remove connection_pool argument"

diff --git a/UPSTREAM b/UPSTREAM
index 2e04abd..de01cbf 100644 (file)
--- 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 cd836f1..c55d562 100644 (file)
--- 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