From 044852c1be35d11debbab981062e8f4a2ae6231e Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 12 Jan 2021 12:04:13 +0000 Subject: [PATCH] Move placement pip package from a constraint to a requirement This is necessary to support the new pip resolver. Depends-On: I9be6bbf4a29a4da2ddf96dc0336bc2a7d8ec9281 Depends-On: I49c75dd11d6c4e8d37fe013b7ffdfd56ff193fcd Change-Id: I00b42c61d03c83bfbfec69ad3bd47d940bb449d2 --- defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a17b84c..2d13faf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -30,7 +30,6 @@ placement_git_repo: https://opendev.org/openstack/placement placement_git_install_branch: master placement_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" placement_git_constraints: - - "git+{{ placement_git_repo }}@{{ placement_git_install_branch }}#egg=openstack-placement" - "--constraint {{ placement_upper_constraints_url }}" placement_pip_install_args: "{{ pip_install_options | default('') }}" @@ -92,7 +91,7 @@ placement_role_name: admin # Common pip packages placement_pip_packages: - - openstack-placement + - "git+{{ placement_git_repo }}@{{ placement_git_install_branch }}#egg=openstack-placement" - PyMySQL - pymemcache - python-memcached