diff --git a/defaults/main.yml b/defaults/main.yml index b4a42bcd..b7eac775 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/tasks/keystone_install_source.yml b/tasks/keystone_install_source.yml index f6265093..420f60b0 100644 --- a/tasks/keystone_install_source.yml +++ b/tasks/keystone_install_source.yml @@ -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" diff --git a/vars/distro_install.yml b/vars/distro_install.yml index c8ee81ad..73d725d3 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -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 }} diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 874fb261..5bcbd36e 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -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" diff --git a/vars/source_install.yml b/vars/source_install.yml index b9a8584d..9228fba2 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -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 }} diff --git a/vars/suse-42.yml b/vars/suse-42.yml index eb8b3a10..c16e4af3 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -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" diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index ad1787b5..0bf168ea 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -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"