Merge "Setup oslo.messaging extra packages for optional drivers"

defaults/main.yml

@@ -146,6 +146,10 @@ trove_oslomsg_notify_userid: "{{ trove_oslomsg_rpc_userid }}"
 trove_oslomsg_notify_password: "{{ trove_oslomsg_rpc_password }}"
 trove_oslomsg_notify_vhost: "{{ trove_oslomsg_rpc_vhost }}"
 
+## Qdrouterd integration
+# TODO(ansmith): Change structure when more backends will be supported
+trove_oslomsg_amqp1_enabled: "{{ trove_oslomsg_rpc_transport == 'amqp' }}"
+
 # Rabbit vars
 trove_control_exchange: trove
 trove_rabbit_notification_topic: notification
@@ -221,6 +225,9 @@ trove_pip_packages:
   - python-memcached
   - trove
 
+trove_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
 # pip packages required by this role. The value is picked up

tasks/trove_install.yml

@@ -128,6 +128,23 @@
   tags:
     - skip_ansible_lint
 
+- name: Install optional pip packages
+  pip:
+    name: "{{ trove_optional_oslomsg_amqp1_pip_packages }}"
+    state: "{{ trove_pip_package_state }}"
+    virtualenv: "{{ trove_bin | dirname }}"
+    virtualenv_site_packages: "no"
+  when: trove_oslomsg_amqp1_enabled
+  register: install_optional_packages
+  until: install_optional_packages is success
+  retries: 5
+  delay: 2
+  notify:
+    - Restart trove API services
+    - Restart trove conductor service
+    - Restart trove taskmanager service
+    - Restart Apache
+
 - name: Record the venv tag deployed
   ini_file:
     dest: "/etc/ansible/facts.d/openstack_ansible.fact"