From: Carlos Goncalves <carlos.goncalves@neclab.eu>
Date: Wed, 26 Jul 2017 10:36:34 +0000 (+0000)
Subject: Merge "Fix host status grep bug and Remove connection_pool argument"
X-Git-Tag: opnfv-5.0.RC1~38
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9eb18cabdddda3a2e0bbd05076bc1786ebe6be8b;hp=7e13330620e235e9611ed1b474bcfb33902797f5;p=doctor.git

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

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