Setup oslo.messaging extra packages for optional drivers

Change-Id: Idfbe2b798168187ed7140a248ce1f60bf8882f39
This commit is contained in:
Andy Smith 2018-07-20 14:26:19 -04:00
parent 131cc11f69
commit 5bc4850987
7 changed files with 32 additions and 1 deletions

View File

@ -148,6 +148,10 @@ keystone_oslomsg_notify_userid: "{{ keystone_oslomsg_rpc_userid }}"
keystone_oslomsg_notify_password: "{{ keystone_oslomsg_rpc_password }}"
keystone_oslomsg_notify_vhost: "{{ keystone_oslomsg_rpc_vhost }}"
## (Qdrouterd) info
# TODO(ansmith): Change structure when more backends will be supported
keystone_oslomsg_amqp1_enabled: "{{ keystone_oslomsg_rpc_transport == 'amqp' }}"
## Role info
keystone_role_name: admin
keystone_default_role_name: _member_
@ -446,6 +450,11 @@ keystone_pip_packages:
- python-openstackclient
- systemd-python
- uWSGI
- pyngus
# optional pip packages
keystone_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]
# This variable is used by the repo_build process to determine
# which host group to check for members of before building the

View File

@ -43,7 +43,9 @@
venv_install_destination_path: "{{ keystone_bin | dirname }}"
venv_install_distro_package_list: "{{ keystone_distro_packages }}"
venv_pip_install_args: "{{ keystone_pip_install_args }}"
venv_pip_packages: "{{ keystone_pip_packages }}"
venv_pip_packages: >-
{{ keystone_pip_packages +
(keystone_oslomsg_amqp1_enabled | bool) | ternary(keystone_optional_oslomsg_amqp1_pip_packages, []) }}
venv_facts_when_changed:
- section: "keystone"
option: "need_db_expand"

View File

@ -31,6 +31,9 @@ keystone_package_list: |-
{% else %}
{% set _ = packages.extend(keystone_nginx_distro_packages) %}
{% endif %}
{% if keystone_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(keystone_oslomsg_amqp1_distro_packages) %}
{% endif %}
{% set _ = packages.extend(keystone_service_distro_packages) %}
{{ packages }}

View File

@ -56,6 +56,11 @@ keystone_sp_distro_packages:
keystone_developer_mode_distro_packages:
- gcc
keystone_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib
- cyrus-sasl-plain
- cyrus-sasl-md5
keystone_apache_default_sites:
- "/etc/httpd/conf.d/userdir.conf"
- "/etc/httpd/conf.d/welcome.conf"

View File

@ -34,6 +34,9 @@ keystone_package_list: |-
{% if keystone_developer_mode | bool %}
{% set _ = packages.extend(keystone_developer_mode_distro_packages) %}
{% endif %}
{% if keystone_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(keystone_oslomsg_amqp1_distro_packages) %}
{% endif %}
{% set _ = packages.extend(keystone_devel_distro_packages) %}
{{ packages }}

View File

@ -57,6 +57,11 @@ keystone_sp_distro_packages:
keystone_developer_mode_distro_packages:
- patterns-openSUSE-devel_basis
keystone_oslomsg_amqp1_distro_packages:
- cyrus-sasl
- cyrus-sasl-plain
- cyrus-sasl-digestmd5
keystone_apache_default_sites:
- "/etc/apache2/conf.d/gitweb.conf"

View File

@ -56,6 +56,10 @@ keystone_sp_distro_packages:
keystone_developer_mode_distro_packages:
- build-essential
keystone_oslomsg_amqp1_distro_packages:
- libsasl2-modules
- sasl2-bin
keystone_apache_default_sites:
- "/etc/apache2/sites-enabled/000-default.conf"