From 6958079640b89d637b4c40abb1d857e12f99adfb Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 12 Jan 2021 11:34:57 +0000 Subject: [PATCH] Move cinder 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: I2c4009fbdf524f2d54adf1d4a730604c123f72fd --- defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3094941e..29188f2c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,7 +31,6 @@ cinder_git_repo: https://opendev.org/openstack/cinder cinder_git_install_branch: master cinder_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" cinder_git_constraints: - - "git+{{ cinder_git_repo }}@{{ cinder_git_install_branch }}#egg=cinder" - "--constraint {{ cinder_upper_constraints_url }}" cinder_pip_install_args: "{{ pip_install_options | default('') }}" @@ -289,7 +288,7 @@ cinder_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}" # Common pip packages cinder_pip_packages: - - cinder + - "git+{{ cinder_git_repo }}@{{ cinder_git_install_branch }}#egg=cinder" - cryptography - ecdsa - httplib2