diff --git a/vars/debian.yml b/vars/debian.yml
index 39cfd24..0a0e9ad 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -43,6 +43,10 @@ aodh_service_distro_packages:
 aodh_test_distro_packages:
   - git
 
+aodh_oslomsg_amqp1_distro_packages:
+  - libsasl2-modules
+  - sasl2-bin
+
 aodh_system_service_name: apache2
 
 aodh_apache_config:
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 2300dfa..b5611e5 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aodh_package_list: "{{ aodh_distro_packages + aodh_service_distro_packages }}"
+aodh_package_list: |-
+  {% set packages = (aodh_distro_packages + aodh_service_distro_packages) %}
+  {% if aodh_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(aodh_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 
 _aodh_bin: "/usr/bin"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 01e2550..2d5dac4 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -39,6 +39,11 @@ aodh_service_distro_packages:
 aodh_test_distro_packages:
   - git
 
+aodh_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl-lib
+  - cyrus-sasl-plain
+  - cyrus-sasl-md5
+
 aodh_system_service_name: httpd
 
 aodh_apache_config:
diff --git a/vars/source_install.yml b/vars/source_install.yml
index a464752..18d8f48 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aodh_package_list: "{{ aodh_distro_packages + aodh_devel_distro_packages }}"
+aodh_package_list: |-
+  {% set packages = (aodh_distro_packages + aodh_devel_distro_packages) %}
+  {% if aodh_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(aodh_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 
 _aodh_bin: "/openstack/venvs/aodh-{{ aodh_venv_tag }}/bin"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 15fa4bf..ce5740f 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -42,6 +42,11 @@ aodh_service_distro_packages:
 aodh_test_distro_packages:
   - git-core
 
+aodh_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl
+  - cyrus-sasl-plain
+  - cyrus-sasl-digestmd5
+
 aodh_system_service_name: apache2
 
 aodh_apache_config: