diff --git a/requirements.txt b/requirements.txt index dd9dd57f..64f11524 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ Babel>=1.3 # processing code http://tarballs.openstack.org/tripleo-heat-templates/tripleo-heat-templates-master.tar.gz#egg=tripleo_heat_templates eventlet>=0.13.0 -Flask>=0.10,<1.0 greenlet>=0.3.2 iso8601>=0.1.8 kombu>=2.4.8 diff --git a/tuskar/api/__init__.py b/tuskar/api/__init__.py index 01893970..55b76dce 100644 --- a/tuskar/api/__init__.py +++ b/tuskar/api/__init__.py @@ -13,13 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import flask.helpers from oslo.config import cfg -from tuskar.openstack.common import jsonutils - -flask.helpers.json = jsonutils - API_SERVICE_OPTS = [ cfg.StrOpt( 'tuskar_api_bind_ip',