Move glance 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: I41fc05409433b4e22307ad604c15d30bcea32abd
This commit is contained in:
Jonathan Rosser 2021-01-12 11:36:29 +00:00
parent 6c148e0b1c
commit a6b1bc17d5

View File

@ -34,7 +34,6 @@ glance_git_repo: https://opendev.org/openstack/glance
glance_git_install_branch: master
glance_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
glance_git_constraints:
- "git+{{ glance_git_repo }}@{{ glance_git_install_branch }}#egg=glance"
- "--constraint {{ glance_upper_constraints_url }}"
glance_pip_install_args: "{{ pip_install_options | default('') }}"
@ -231,8 +230,8 @@ glance_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
# Common pip packages
glance_pip_packages:
- "git+{{ glance_git_repo }}@{{ glance_git_install_branch }}#egg=glance"
- cryptography
- glance
- keystonemiddleware
- os-brick
- oslo.rootwrap