Merge "Simplify pip options/constraints mechanism"

defaults/main.yml

@@ -29,10 +29,6 @@ designate_git_install_branch: master
 # of an OpenStack-Ansible repo_server.
 designate_developer_mode: False
 
-## The git source/branch for the upper-constraints (used in developer mode)
-designate_requirements_git_repo: https://git.openstack.org/openstack/requirements
-designate_requirements_git_install_branch: master
-
 ## The packages to build from source (used in developer mode)
 designate_developer_constraints:
   - "git+{{ designate_git_repo }}@{{ designate_git_install_branch }}#egg=designate"

tasks/designate_install.yml

@@ -24,36 +24,15 @@
       {% for item in designate_developer_constraints %}
       {{ item }}
       {% endfor %}
-  when:
-    - designate_developer_mode | bool
-
-- name: Clone requirements git repository
-  git:
-    repo: "{{ designate_requirements_git_repo }}"
-    dest: "/opt/requirements"
-    clone: yes
-    update: yes
-    version: "{{ designate_requirements_git_install_branch }}"
-  when:
-    - designate_developer_mode | bool
-
-- name: Add constraints to pip_install_options fact for developer mode
-  set_fact:
-    pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
-  when:
-    - designate_developer_mode | bool
-
-- name: Set pip_install_options_fact when not in developer mode
-  set_fact:
-    pip_install_options_fact: "{{ pip_install_options|default('') }}"
-  when:
-    - not designate_developer_mode | bool
+  when: designate_developer_mode | bool
 
 - name: Install requires pip packages
   pip:
     name: "{{ designate_requires_pip_packages | join(' ') }}"
     state: latest
-    extra_args: "{{ pip_install_options_fact }}"
+    extra_args: >-
+      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      {{ pip_install_options | default('') }}
   register: install_packages
   until: install_packages|success
   retries: 5
@@ -129,7 +108,10 @@
     state: latest
     virtualenv: "{{ designate_bin | dirname }}"
     virtualenv_site_packages: "no"
-    extra_args: "{{ pip_install_options_fact }}"
+    extra_args: >-
+      {{ keystone_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}
+      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      {{ pip_install_options | default('') }}
   register: install_packages
   until: install_packages|success
   retries: 5