Browse Source

Merge "Add glance_user_pip_packages variable"

Zuul 1 month ago
parent
commit
9539f40f7c
2 changed files with 5 additions and 1 deletions
  1. 3
    0
      defaults/main.yml
  2. 2
    1
      tasks/glance_install_source.yml

+ 3
- 0
defaults/main.yml View File

@@ -263,6 +263,9 @@ glance_pip_packages:
263 263
   - uwsgi
264 264
   - warlock
265 265
 
266
+# Specific pip packages provided by the user
267
+glance_user_pip_packages: []
268
+
266 269
 glance_optional_oslomsg_amqp1_pip_packages:
267 270
   - oslo.messaging[amqp1]
268 271
 

+ 2
- 1
tasks/glance_install_source.yml View File

@@ -42,7 +42,8 @@
42 42
     venv_install_destination_path: "{{ glance_bin | dirname }}"
43 43
     venv_install_distro_package_list: "{{ glance_distro_packages }}"
44 44
     venv_pip_install_args: "{{ glance_pip_install_args }}"
45
-    venv_pip_packages: "{{ (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_pip_packages + glance_optional_oslomsg_amqp1_pip_packages, glance_pip_packages) }}"
45
+    venv_pip_packages: "{{ glance_pip_packages | union(glance_user_pip_packages) +
46
+    (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_optional_oslomsg_amqp1_pip_packages, []) }}"
46 47
     venv_facts_when_changed:
47 48
       - section: "glance"
48 49
         option: "need_service_restart"

Loading…
Cancel
Save