Browse Source

Add extra distro packages for optional oslo.messaging amqp1 driver

Change-Id: Ib7541da6f50aed75b428037f43ca7d0da7c27a21
Andy Smith 8 months ago
parent
commit
910522562e
5 changed files with 26 additions and 2 deletions
  1. 6
    1
      vars/distro_install.yml
  2. 5
    0
      vars/redhat-7.yml
  3. 6
    1
      vars/source_install.yml
  4. 5
    0
      vars/suse-42.yml
  5. 4
    0
      vars/ubuntu.yml

+ 6
- 1
vars/distro_install.yml View File

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

+ 5
- 0
vars/redhat-7.yml View File

@@ -27,4 +27,9 @@ glance_service_distro_packages:
27 27
   - uwsgi
28 28
   - uwsgi-plugin-python
29 29
 
30
+glance_oslomsg_amqp1_distro_packages:
31
+  - cyrus-sasl-lib
32
+  - cyrus-sasl-plain
33
+  - cyrus-sasl-md5
34
+
30 35
 glance_uwsgi_bin: '/usr/sbin'

+ 6
- 1
vars/source_install.yml View File

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

+ 5
- 0
vars/suse-42.yml View File

@@ -29,4 +29,9 @@ glance_service_distro_packages:
29 29
   - uwsgi
30 30
   - uwsgi-python
31 31
 
32
+glance_oslomsg_amqp1_distro_packages:
33
+  - cyrus-sasl
34
+  - cyrus-sasl-plain
35
+  - cyrus-sasl-digestmd5
36
+
32 37
 glance_uwsgi_bin: '/usr/sbin'

+ 4
- 0
vars/ubuntu.yml View File

@@ -32,4 +32,8 @@ glance_service_distro_packages:
32 32
   - uwsgi
33 33
   - uwsgi-plugin-python
34 34
 
35
+glance_oslomsg_amqp1_distro_packages:
36
+  - libsasl2-modules
37
+  - sasl2-bin
38
+
35 39
 glance_uwsgi_bin: '/usr/bin'

Loading…
Cancel
Save