Merge "Initial Cinder tests"
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index c978a52..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include AUTHORS
-include ChangeLog
-exclude .gitignore
-exclude .gitreview
-
-global-exclude *.pyc
diff --git a/patrole_tempest_plugin/rbac_rule_validation.py b/patrole_tempest_plugin/rbac_rule_validation.py
index 7785eea..e11ae4c 100644
--- a/patrole_tempest_plugin/rbac_rule_validation.py
+++ b/patrole_tempest_plugin/rbac_rule_validation.py
@@ -13,8 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import logging
-
+from oslo_log import log as logging
from tempest import config
from tempest.lib import exceptions
diff --git a/patrole_tempest_plugin/rbac_utils.py b/patrole_tempest_plugin/rbac_utils.py
index 7792cbd..1150416 100644
--- a/patrole_tempest_plugin/rbac_utils.py
+++ b/patrole_tempest_plugin/rbac_utils.py
@@ -14,11 +14,11 @@
# under the License.
import json
-import logging
import six
import time
import urllib3
+from oslo_log import log as logging
from tempest import config
from patrole_tempest_plugin import rbac_exceptions as rbac_exc
diff --git a/patrole_tempest_plugin/tests/api/image/test_images_rbac.py b/patrole_tempest_plugin/tests/api/image/test_images_rbac.py
index 9d257c0..7df5461 100644
--- a/patrole_tempest_plugin/tests/api/image/test_images_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/test_images_rbac.py
@@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
-import logging
from six import moves
+from oslo_log import log as logging
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
diff --git a/requirements.txt b/requirements.txt
index 29091ac..b22bec8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@
pbr>=1.8 # Apache-2.0
urllib3>=1.15.1 # MIT
+oslo.log>=3.11.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index c174fca..a8732dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@
README.rst
author = OpenStack
author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = http://docs.openstack.org/developer/patrole/
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
diff --git a/test-requirements.txt b/test-requirements.txt
index cbb75b1..dddb31f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,4 +10,5 @@
coverage>=4.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
oslo.policy>=1.17.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
tempest>=12.1.0 # Apache-2.0