Browse Source

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
Jesse Pretorius 8 months ago
parent
commit
968ea1f223

+ 0
- 4
defaults/main.yml View File

@@ -69,10 +69,6 @@ repo_pkg_cache_group: apt-cacher-ng
69 69
 # Set the log directory
70 70
 repo_service_log_dir: /var/log/apt-cacher-ng
71 71
 
72
-# Required packages to install on the host
73
-repo_requires_pip_packages:
74
-  - virtualenv
75
-
76 72
 # Set the list of packages for the pypiserver
77 73
 repo_pypiserver_pip_packages:
78 74
  - "pypiserver[cache]==1.2.0"

+ 0
- 1
meta/main.yml View File

@@ -38,4 +38,3 @@ dependencies:
38 38
   - role: apt_package_pinning
39 39
     when:
40 40
       - ansible_pkg_mgr == 'apt'
41
-  - role: pip_install

+ 5
- 0
releasenotes/notes/repo-server-required-packages-9a5b1a5c1236030f.yaml View File

@@ -0,0 +1,5 @@
1
+---
2
+deprecations:
3
+  - |
4
+    The variable ``repo_requires_pip_packages`` is no longer required
5
+    and has therefore been removed.

+ 0
- 18
tasks/repo_install.yml View File

@@ -77,24 +77,6 @@
77 77
       - "/usr/local/lib/python2.7/site-packages"
78 78
   register: _virtualenv_support
79 79
 
80
-# TODO(odyssey4me):
81
-# We force a reinstall of the required pip packages when the
82
-# virtualenv_support folder is absent. This is to ensure that
83
-# we're able to create the venv properly for pypiserver.
84
-# The state ternary filter can be removed in Rocky as this is
85
-# only required for Pike->Queens upgrades.
86
-- name: Install required pip packages
87
-  pip:
88
-    name: "{{ repo_requires_pip_packages }}"
89
-    state: "{{ (_virtualenv_support['matched'] | int > 0) | ternary(repo_server_pip_package_state, 'forcereinstall') }}"
90
-    extra_args: >-
91
-      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
92
-      {{ pip_install_options | default('') }}
93
-  register: install_packages
94
-  until: install_packages is success
95
-  retries: 5
96
-  delay: 2
97
-
98 80
 # Note(odyssey4me):
99 81
 # To cater for a situation where the pip packages are changing, but the repo
100 82
 # does not yet have the package built, we need to ensure that this task can

Loading…
Cancel
Save