Merge "Use upper-constraints file in developer mode"

defaults/main.yml

@@ -23,6 +23,8 @@ cache_timeout: 600
 
 swift_git_repo: https://git.openstack.org/openstack/swift
 swift_git_install_branch: master
+swift_requirements_git_repo: https://git.openstack.org/openstack/requirements
+swift_requirements_git_install_branch: master
 swift_developer_mode: false
 swift_developer_constraints:
   - "git+{{ swift_git_repo }}@{{ swift_git_install_branch }}#egg=swift"

tasks/swift_install.yml

@@ -56,15 +56,30 @@
     - swift-install
     - swift-pip-packages
 
-- name: Set constraint file fact for developer mode
-  set_fact:
-    pip_install_options: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt"
+- name: Clone requirements git repository
+  git:
+    repo: "{{ swift_requirements_git_repo }}"
+    dest: "/opt/requirements"
+    clone: yes
+    update: yes
+    version: "{{ swift_requirements_git_install_branch }}"
   when:
     - swift_developer_mode | bool
   tags:
     - swift-install
     - swift-pip-packages
 
+- name: Add constraints to pip_install_options fact for developer mode
+  set_fact:
+    pip_install_options: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
+  when:
+    - swift_developer_mode | bool
+    - "'/opt/developer-pip-constraints.txt' not in pip_install_options|default('')"
+    - "'/opt/requirements/upper-constraints.txt' not in pip_install_options|default('')"
+  tags:
+    - swift-install
+    - swift-pip-packages
+
 - name: Install requires pip packages
   pip:
     name: "{{ item }}"