Merge "Use upper-constraints file in developer mode"

defaults/main.yml

@@ -22,6 +22,8 @@ cache_timeout: 600
 
 glance_git_repo: https://git.openstack.org/openstack/glance
 glance_git_install_branch: master
+glance_requirements_git_repo: https://git.openstack.org/openstack/requirements
+glance_requirements_git_install_branch: master
 glance_developer_mode: false
 glance_developer_constraints:
   - "git+{{ glance_git_repo }}@{{ glance_git_install_branch }}#egg=glance"

tasks/glance_install.yml

@@ -43,15 +43,30 @@
     - glance-install
     - glance-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: "{{ glance_requirements_git_repo }}"
+    dest: "/opt/requirements"
+    clone: yes
+    update: yes
+    version: "{{ glance_requirements_git_install_branch }}"
   when:
     - glance_developer_mode | bool
   tags:
     - glance-install
     - glance-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:
+    - glance_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:
+    - glance-install
+    - glance-pip-packages
+
 - name: Install apt packages
   apt:
     pkg: "{{ item }}"

tests/test.yml

@@ -201,6 +201,7 @@
     keystone_venv_tag: "testing"
     keystone_developer_mode: true
     keystone_git_install_branch: a55128044f763f5cfe2fdc57c738eaca97636448
+    keystone_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0
     keystone_auth_admin_token: "SuperSecreteTestToken"
     keystone_auth_admin_password: "SuperSecretePassword"
     keystone_service_password: "secrete"
@@ -296,6 +297,7 @@
     glance_venv_tag: "testing"
     glance_developer_mode: true
     glance_git_install_branch: 7d5c3710ce2739a8ac356208d4e104f2ce3ec9ab
+    glance_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0
     glance_service_password: "secrete"
     glance_profiler_hmac_key: "secrete"
     openrc_os_password: "{{ keystone_auth_admin_password }}"