Move heat pip packages from constraints to requirements

This is necessary to use the new pip resolver

Change-Id: I1c18871b81117654e12b9690a9d112236ba4eeff
This commit is contained in:
Jonathan Rosser 2021-01-25 10:03:40 +00:00
parent 9dc51b5386
commit 0ae39643ce

View File

@ -40,7 +40,6 @@ heat_git_repo: https://opendev.org/openstack/heat
heat_git_install_branch: master heat_git_install_branch: master
heat_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" heat_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
heat_git_constraints: heat_git_constraints:
- "git+{{ heat_git_repo }}@{{ heat_git_install_branch }}#egg=openstack-heat"
- "--constraint {{ heat_upper_constraints_url }}" - "--constraint {{ heat_upper_constraints_url }}"
heat_pip_install_args: "{{ pip_install_options | default('') }}" heat_pip_install_args: "{{ pip_install_options | default('') }}"
@ -199,7 +198,7 @@ heat_plugin_dirs:
# Common pip packages # Common pip packages
heat_pip_packages: heat_pip_packages:
- cryptography - cryptography
- openstack-heat - "git+{{ heat_git_repo }}@{{ heat_git_install_branch }}#egg=openstack-heat"
- keystonemiddleware - keystonemiddleware
- osprofiler - osprofiler
- PyMySQL - PyMySQL