diff --git a/defaults/main.yml b/defaults/main.yml index c4df42a..4235b00 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -160,6 +160,9 @@ magnum_pip_packages: - python-memcached - uwsgi +# Specific pip packages provided by the user +magnum_user_pip_packages: [] + magnum_optional_oslomsg_amqp1_pip_packages: - oslo.messaging[amqp1] diff --git a/tasks/magnum_install.yml b/tasks/magnum_install.yml index 766baec..bc6106f 100644 --- a/tasks/magnum_install.yml +++ b/tasks/magnum_install.yml @@ -41,7 +41,8 @@ venv_install_destination_path: "{{ magnum_bin | dirname }}" venv_install_distro_package_list: "{{ magnum_distro_packages }}" venv_pip_install_args: "{{ magnum_pip_install_args }}" - venv_pip_packages: "{{ (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_pip_packages + magnum_optional_oslomsg_amqp1_pip_packages, magnum_pip_packages) }}" + venv_pip_packages: "{{ magnum_pip_packages | union(magnum_user_pip_packages) + + (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_optional_oslomsg_amqp1_pip_packages, []) }}" venv_facts_when_changed: - section: "magnum" option: "venv_tag"