From 910522562e48d7e9c75a9b966c3f8b28fea35b5a Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Wed, 15 Aug 2018 16:50:49 -0400 Subject: [PATCH] Add extra distro packages for optional oslo.messaging amqp1 driver Change-Id: Ib7541da6f50aed75b428037f43ca7d0da7c27a21 --- vars/distro_install.yml | 7 ++++++- vars/redhat-7.yml | 5 +++++ vars/source_install.yml | 7 ++++++- vars/suse-42.yml | 5 +++++ vars/ubuntu.yml | 4 ++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 8c23463f..40512433 100644 --- a/vars/distro_install.yml +++ b/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" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 690b5d85..07e7d89a 100644 --- a/vars/redhat-7.yml +++ b/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' diff --git a/vars/source_install.yml b/vars/source_install.yml index 5626af77..891b1f11 100644 --- a/vars/source_install.yml +++ b/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' }}" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index b120e11e..a7551ca1 100644 --- a/vars/suse-42.yml +++ b/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' diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 8c02a473..2747ed38 100644 --- a/vars/ubuntu.yml +++ b/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'