Remove repo_requires_pip_packages and pip_install meta-dep
Given that the openstack_hosts role installs pip and virtualenv, we do not need this extra meta-dependency and extra task/var. Change-Id: Iac9f72586f6b26bd31d59a4fa5055687ff77f78b
This commit is contained in:
parent
dab934bdb9
commit
968ea1f223
@ -69,10 +69,6 @@ repo_pkg_cache_group: apt-cacher-ng
|
||||
# Set the log directory
|
||||
repo_service_log_dir: /var/log/apt-cacher-ng
|
||||
|
||||
# Required packages to install on the host
|
||||
repo_requires_pip_packages:
|
||||
- virtualenv
|
||||
|
||||
# Set the list of packages for the pypiserver
|
||||
repo_pypiserver_pip_packages:
|
||||
- "pypiserver[cache]==1.2.0"
|
||||
|
@ -38,4 +38,3 @@ dependencies:
|
||||
- role: apt_package_pinning
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- role: pip_install
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
deprecations:
|
||||
- |
|
||||
The variable ``repo_requires_pip_packages`` is no longer required
|
||||
and has therefore been removed.
|
@ -77,24 +77,6 @@
|
||||
- "/usr/local/lib/python2.7/site-packages"
|
||||
register: _virtualenv_support
|
||||
|
||||
# TODO(odyssey4me):
|
||||
# We force a reinstall of the required pip packages when the
|
||||
# virtualenv_support folder is absent. This is to ensure that
|
||||
# we're able to create the venv properly for pypiserver.
|
||||
# The state ternary filter can be removed in Rocky as this is
|
||||
# only required for Pike->Queens upgrades.
|
||||
- name: Install required pip packages
|
||||
pip:
|
||||
name: "{{ repo_requires_pip_packages }}"
|
||||
state: "{{ (_virtualenv_support['matched'] | int > 0) | ternary(repo_server_pip_package_state, 'forcereinstall') }}"
|
||||
extra_args: >-
|
||||
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
|
||||
{{ pip_install_options | default('') }}
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
# Note(odyssey4me):
|
||||
# To cater for a situation where the pip packages are changing, but the repo
|
||||
# does not yet have the package built, we need to ensure that this task can
|
||||
|
Loading…
Reference in New Issue
Block a user