From b4df743cfe82fab40835d3435a46f909e659c742 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Mon, 25 Jan 2021 10:06:15 +0000
Subject: [PATCH] Move ironic pip packages from constraints to requirements

This is necessary to use the new pip resolver

Depends-On: I6003a1004b6042a804ea142684b42b17f16d6da8
Change-Id: I06958da8881c93abde25c114d06943d777ea2b0a
---
 defaults/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 789a55fd..d27409fc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -41,8 +41,6 @@ ironic_git_install_branch: master
 ironic_inspector_git_install_branch: master
 ironic_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 ironic_git_constraints:
-  - "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic"
-  - "git+{{ ironic_inspector_git_repo }}@{{ ironic_inspector_git_install_branch }}#egg=ironic-inspector"
   - "--constraint {{ ironic_upper_constraints_url }}"
 
 ironic_pip_install_args: "{{ pip_install_options | default('') }}"
@@ -189,8 +187,8 @@ ironic_recreate_keys: False
 ironic_tftp_server_address: "{{ ansible_host }}"
 
 ironic_pip_packages:
+  - "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic"
   - cryptography
-  - ironic
   - osprofiler
   - proliantutils
   - PyMySQL
@@ -207,7 +205,7 @@ ironic_pip_packages:
   - systemd-python
 
 ironic_inspector_pip_packages:
-  - ironic-inspector
+  - "git+{{ ironic_inspector_git_repo }}@{{ ironic_inspector_git_install_branch }}#egg=ironic-inspector"
   - python-ironic-inspector-client
 
 # Memcached override