Add extra distro packages for optional oslo.messaging amqp1 driver

Change-Id: Ib7541da6f50aed75b428037f43ca7d0da7c27a21

vars/distro_install.yml

@@ -13,7 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-glance_package_list: "{{ glance_distro_packages + glance_service_distro_packages }}"
+glance_package_list: |-
+  {% set packages = (glance_distro_packages + glance_service_distro_packages) %}
+  {% if glance_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(glance_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 
 _glance_bin: "/usr/bin"
 _glance_etc: "/etc"

vars/redhat-7.yml

@@ -27,4 +27,9 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
+glance_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl-lib
+  - cyrus-sasl-plain
+  - cyrus-sasl-md5
+
 glance_uwsgi_bin: '/usr/sbin'

vars/source_install.yml

@@ -13,7 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-glance_package_list: "{{ glance_distro_packages + glance_devel_distro_packages }}"
+glance_package_list: |-
+  {% set packages = (glance_distro_packages + glance_service_distro_packages) %}
+  {% if glance_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(glance_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
+  {{ packages }}
 
 _glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"
 _glance_etc: "{{ _glance_bin | dirname + '/etc' }}"

vars/suse-42.yml

@@ -29,4 +29,9 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-python
 
+glance_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl
+  - cyrus-sasl-plain
+  - cyrus-sasl-digestmd5
+
 glance_uwsgi_bin: '/usr/sbin'

vars/ubuntu.yml

@@ -32,4 +32,8 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
+glance_oslomsg_amqp1_distro_packages:
+  - libsasl2-modules
+  - sasl2-bin
+
 glance_uwsgi_bin: '/usr/bin'