Pin pyrsistent as a new release(0.17.0) breaks python2.7 support

Change-Id: Iffc995656a43224ae9c018c3c141b13e4d0216e5

ansible/install/roles/rally/tasks/main.yml

@@ -15,17 +15,17 @@
     line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
   when: overcloud_ca_path is defined
 
+- name: Install rally-requirements into rally-venv
+  pip:
+    requirements: "{{ browbeat_path }}/tools-requirements.txt"
+    virtualenv: "{{ rally_venv }}"
+
 - name: Install Rally with OpenStack plugins into rally-venv
   pip:
     name: rally-openstack
     version: "{{ rally_openstack_version }}"
     virtualenv: "{{ rally_venv }}"
 
-- name: Install rally-requirements.txt into rally-venv
-  pip:
-    requirements: "{{ browbeat_path }}/rally-requirements.txt"
-    virtualenv: "{{ rally_venv }}"
-
 - name: Create rally configuration directory
   file:
     path: "{{ rally_venv }}/etc/rally"

ansible/install/roles/shaker/tasks/main.yml

@@ -12,6 +12,11 @@
     line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
   when: overcloud_ca_path is defined
 
+- name: Install shaker-requirements into shaker-venv
+  pip:
+    requirements: "{{ browbeat_path }}/tools-requirements.txt"
+    virtualenv: "{{ shaker_venv }}"
+
 - name: Install shaker
   pip:
     name: pyshaker

rally-requirements.txt

@@ -1,2 +0,0 @@
-setuptools>=40.3.0
-elasticsearch

requirements.txt

@@ -2,6 +2,8 @@
 # buggy minor version (!=) or capping (<) once you have proof it breaks.
 ansible>=2.4.1
 elasticsearch
+pyrsistent==0.16.0;python_version<'3'
+pyrsistent>=0.17.0;python_version>='3'
 grafyaml>=0.0.7
 openstacksdk
 python-dateutil>=2.4.2

test-requirements.txt

@@ -8,6 +8,8 @@ hacking>=1.1.0,<1.2.0;python_version<'3' # Apache-2.0
 pykwalify
 coverage>=3.6
 pre-commit  # MIT
+pyrsistent==0.16.0;python_version<'3'
+pyrsistent>=0.17.0;python_version>='3'
 pytest==3.2.1
 python-subunit>=0.0.18
 

tools-requirements.txt

@@ -0,0 +1,4 @@
+setuptools>=40.3.0
+elasticsearch
+pyrsistent==0.16.0;python_version<'3'
+pyrsistent>=0.17.0;python_version>='3'