From a5a554541953d201915be6cc03378054d315ca25 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Tue, 15 Dec 2015 18:18:31 -0800
Subject: [PATCH] Drop gunicorn from requirementes.txt

We dont ever actually import this anywhere or depend on it as a python
dependency.  Instead, its part of our diskimage-builder elements and
is largely an opinionated deployer choice we've made.  The only purpose
having it in requirements.txt is to pull it in during installation, which
should be delegated to ansible/DIB instead.

This also manually sync's global-requirements along with the update.

Closes-bug: #1526527

Change-Id: I834efb47ccda02a5163c5083836ff29fdc3fdd6f
---
 ansible/tasks/astara.yml                    | 3 ++-
 astara_router/commands/management.py        | 4 ++--
 requirements.txt                            | 4 +---
 scripts/etc/init.d/astara-router-api-server | 4 ++--
 setup.py                                    | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ansible/tasks/astara.yml b/ansible/tasks/astara.yml
index 0ee3de1..450f4e3 100644
--- a/ansible/tasks/astara.yml
+++ b/ansible/tasks/astara.yml
@@ -3,6 +3,7 @@
 - name: install base packages
   apt: name={{item}} state=installed install_recommends=no
   with_items:
+    - gunicorn
     - python-pip
     - python-dev
     - logrotate
@@ -26,7 +27,7 @@
   template: src=logrotate.j2 dest=/etc/logrotate.d/astara
 
 - name: install gunicorn config file
-  template: src=gunicorn.j2 dest=/etc/astara_gunicorn_config
+  template: src=gunicorn.j2 dest=/etc/astara_gunicorn_config.py
 
 - name: install init.d files
   copy: src={{playbook_dir}}/../scripts/etc/init.d/{{item}} dest=/etc/init.d/{{item}} mode=0555
diff --git a/astara_router/commands/management.py b/astara_router/commands/management.py
index 781b8c5..be79e15 100644
--- a/astara_router/commands/management.py
+++ b/astara_router/commands/management.py
@@ -56,11 +56,11 @@ def configure_gunicorn(listen_ip):
     else:
         bind = "'%s:%d'" % (listen_ip, defaults.API_SERVICE)
 
-    config = open('/etc/astara_gunicorn_config', 'r').read()
+    config = open('/etc/astara_gunicorn_config.py', 'r').read()
     config = re.sub('\nbind(\s)?\=(\s)?.*', '\nbind = %s' % bind, config)
 
     try:
-        open('/etc/astara_gunicorn_config', 'w+').write(config)
+        open('/etc/astara_gunicorn_config.py', 'w+').write(config)
         sys.stderr.write('http configured to listen on %s\n' % listen_ip)
     except:
         sys.stderr.write('Unable to write gunicorn configuration file.')
diff --git a/requirements.txt b/requirements.txt
index c4652e5..ea366c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,5 @@ Flask<1.0,>=0.10
 dogpile.cache>=0.5.4
 netaddr!=0.7.16,>=0.7.12
 eventlet>=0.17.4
-requests>=2.5.2
+requests!=2.9.0,>=2.8.1
 greenlet>=0.3.2
-
-gunicorn>=0.14.6,<1  # Not in global-requirements.txt
diff --git a/scripts/etc/init.d/astara-router-api-server b/scripts/etc/init.d/astara-router-api-server
index de97e4f..8a5ace4 100755
--- a/scripts/etc/init.d/astara-router-api-server
+++ b/scripts/etc/init.d/astara-router-api-server
@@ -11,9 +11,9 @@
 
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON="/usr/local/bin/gunicorn"
+DAEMON="/usr/bin/gunicorn"
 NAME="astara-router-api-server"
-OPTIONS="--pythonpath /usr/local/share/astara -c /etc/astara_gunicorn_config astara_router.api.server:app"
+OPTIONS="--pythonpath /usr/local/share/astara -c /etc/astara_gunicorn_config.py astara_router.api.server:app"
 PIDFILE=/var/run/gunicorn.pid
 
 test -x $DAEMON || exit 0
diff --git a/setup.py b/setup.py
index d8080d0..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)