diff --git a/defaults/main.yml b/defaults/main.yml index 78bf49e..680f2a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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" diff --git a/meta/main.yml b/meta/main.yml index f295162..72e4a3c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -38,4 +38,3 @@ dependencies: - role: apt_package_pinning when: - ansible_pkg_mgr == 'apt' - - role: pip_install diff --git a/releasenotes/notes/repo-server-required-packages-9a5b1a5c1236030f.yaml b/releasenotes/notes/repo-server-required-packages-9a5b1a5c1236030f.yaml new file mode 100644 index 0000000..4b8690d --- /dev/null +++ b/releasenotes/notes/repo-server-required-packages-9a5b1a5c1236030f.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The variable ``repo_requires_pip_packages`` is no longer required + and has therefore been removed. diff --git a/tasks/repo_install.yml b/tasks/repo_install.yml index 3ecd2a3..2359c06 100644 --- a/tasks/repo_install.yml +++ b/tasks/repo_install.yml @@ -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