Browse Source

Merge "Add magnum_user_pip_packages variable"

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

+ 3
- 0
defaults/main.yml View File

@@ -160,6 +160,9 @@ magnum_pip_packages:
160 160
   - python-memcached
161 161
   - uwsgi
162 162
 
163
+# Specific pip packages provided by the user
164
+magnum_user_pip_packages: []
165
+
163 166
 magnum_optional_oslomsg_amqp1_pip_packages:
164 167
   - oslo.messaging[amqp1]
165 168
 

+ 2
- 1
tasks/magnum_install.yml View File

@@ -41,7 +41,8 @@
41 41
     venv_install_destination_path: "{{ magnum_bin | dirname }}"
42 42
     venv_install_distro_package_list: "{{ magnum_distro_packages }}"
43 43
     venv_pip_install_args: "{{ magnum_pip_install_args }}"
44
-    venv_pip_packages: "{{ (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_pip_packages + magnum_optional_oslomsg_amqp1_pip_packages, magnum_pip_packages) }}"
44
+    venv_pip_packages: "{{ magnum_pip_packages | union(magnum_user_pip_packages) +
45
+    (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_optional_oslomsg_amqp1_pip_packages, []) }}"
45 46
     venv_facts_when_changed:
46 47
       - section: "magnum"
47 48
         option: "venv_tag"

Loading…
Cancel
Save