openstack/openstack-ansible-os_ceilometer
Code Issues Proposed changes

Merge "Move ceilometer pip packages from constraints to requirements"

Browse Source
This commit is contained in:
Zuul 2021-03-16 16:55:05 +00:00 committed by Gerrit Code Review
commit 5226a1cf5b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -37,7 +37,6 @@ ceilometer_git_install_branch: master
## The packages to build from source ## The packages to build from source
ceilometer_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" ceilometer_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
ceilometer_git_constraints: ceilometer_git_constraints:
- "git+{{ ceilometer_git_repo }}@{{ ceilometer_git_install_branch }}#egg=ceilometer"
- "--constraint {{ ceilometer_upper_constraints_url }}" - "--constraint {{ ceilometer_upper_constraints_url }}"
ceilometer_pip_install_args: "{{ pip_install_options | default('') }}" ceilometer_pip_install_args: "{{ pip_install_options | default('') }}"
@ -226,7 +225,7 @@ ceilometer_keystone_auth_type: password
# Common pip packages # Common pip packages
ceilometer_pip_packages: ceilometer_pip_packages:
- ceilometer - "git+{{ ceilometer_git_repo }}@{{ ceilometer_git_install_branch }}#egg=ceilometer"
- ceilometermiddleware - ceilometermiddleware
- cryptography - cryptography
- gnocchiclient - gnocchiclient

13
tasks/ceilometer_install.yml
View File

@ -36,12 +36,23 @@
retries: 5 retries: 5
delay: 2 delay: 2
# NOTE(jrosser)
# ceilometer appears in u-c
# the new pip resolver will fail to install ceilometer if two contradictory
# constraints are given which will always happen with a source install
# and wheels built on the repo server. We must filter ceilometer out of u-c.
- name: Retrieve the constraints URL
uri:
url: "{{ ceilometer_upper_constraints_url }}"
return_content: yes
register: _u_c_contents
- name: Install the python venv - name: Install the python venv
include_role: include_role:
name: "python_venv_build" name: "python_venv_build"
vars: vars:
venv_python_executable: "{{ ceilometer_venv_python_executable }}" venv_python_executable: "{{ ceilometer_venv_python_executable }}"
venv_build_constraints: "{{ ceilometer_git_constraints }}" venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '[ceilometer=*]') | list }}"
venv_build_distro_package_list: "{{ ceilometer_devel_distro_packages }}" venv_build_distro_package_list: "{{ ceilometer_devel_distro_packages }}"
venv_install_destination_path: "{{ ceilometer_bin | dirname }}" venv_install_destination_path: "{{ ceilometer_bin | dirname }}"
venv_install_distro_package_list: "{{ ceilometer_distro_packages }}" venv_install_distro_package_list: "{{ ceilometer_distro_packages }}"