Prepare ocata release

- CHANGELOG updates
- dependencies updates to point to ocata

Bonus: fixes to tox.ini

Once merged, a tag and branch will get created.
After the branch is created, master dependencies
will get reverted to point to master.

Change-Id: Ib49dad32f406ed3c161f42e3b283fe5e186a9bca

CHANGELOG

@@ -1,3 +1,16 @@
+storlets (0.4.0, Openstack Ocata)
+  * Big-Tent changes:
+     - Restructurng the repository to be OpenStack 'compliant'
+     - Port s2aio to devstack for Swift and Keystone
+     - Port installation to Xenial
+     - Move to Keystone V3
+
+  * Initial IPython integration: Deploy a storlet from IPython.
+
+  * Better coverage of python functional tests.
+
+  * Various minor improvements and bug fixes.
+
 storlets (0.3.0, Openstack Newton)
 
   * Python support for writing storlets. This large

install/swift/localrc.sample

@@ -1,6 +1,8 @@
 ENABLE_HTTPD_MOD_WSGI_SERVICES=False
 KEYSTONE_IP=<set ip!>
 SWIFT_IP=<set ip!>
+SWIFT_BRANCH=stable/ocata
+KEYSTONE_BRANCH=stable/ocata
 ENABLED_SERVICES=key,swift,mysql
 ADMIN_USER=admin
 ADMIN_PASSWORD=admin

tox.ini

@@ -37,6 +37,7 @@ commands =
 commands = {[testenv:py34]commands}
 
 [testenv:func]
+basepython = python2.7
 deps =
   -r{toxinidir}/test-requirements.txt
 commands = ./.functests jenkins
@@ -48,6 +49,7 @@ commands = {posargs}
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
+basepython = python2.7
 commands = python setup.py build_sphinx
 
 [testenv:debug]
@@ -89,6 +91,7 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [testenv:pep8]
+basepython = python2.7
 commands =
   {[testenv:pep8python]commands}
   {[testenv:bashate]commands}