Correct logical expressions for storage backends

After introducing the change Iead5167210c4132badb866afc25d4ef14e27f6b2
swift isn't installed if ceph used as a backend for images
and not for object-storage service. In this sutiation we end up
with absence of object-storage at all which is wrong.

The commit introduces changes which makes possible
to swift been installed if ceph used only for image service.

Change-Id: If319845aa9f2d9b3ca07936350ef374f504679cb
Closes-Bug: #1604879
This commit is contained in:
Sergii Rizvan 2017-04-11 20:12:37 +03:00
parent 3452880880
commit 57bb7299b7
3 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@
requires: [openstack-controller, memcached]
condition:
yaql_exp: &swift_enabled >
(not $.storage.objects_ceph and not $.storage.images_ceph) and
not $.storage.objects_ceph and
(changedAny($.network_scheme, $.network_metadata, $.swift,
$.get('swift_master_role', 'primary-controller'),
$.get('swift_object_roles'), ('primary-controller' in $.roles),
@ -63,7 +63,7 @@
requires: [swift-proxy_storage, primary-swift-proxy_storage]
condition:
yaql_exp: >
(not $.storage.objects_ceph and not $.storage.images_ceph) and
not $.storage.objects_ceph and
(changedAny($.storage, $.get('swift_master_role', 'primary-controller'),
$.get('swift_ring_min_part_hours'),('primary-controller' in $.roles)))
parameters:
@ -84,7 +84,7 @@
- name: swift-proxy_storage
condition:
yaql_exp: >
(not $.storage.objects_ceph and not $.storage.images_ceph) and
not $.storage.objects_ceph and
(changedAny($.swift, $.network_metadata.vips,
$.get('region', 'RegionOne'), $.public_ssl, $.get('use_ssl')))
parameters:

View File

@ -12,7 +12,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_radosgw {
$external_lb = hiera('external_lb', false)
if !$external_lb {
if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) {
if !$storage_hash['objects_ceph'] {
$use_swift = true
} else {
$use_swift = false

View File

@ -15,7 +15,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_swift {
$external_lb = hiera('external_lb', false)
if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) {
if !$storage_hash['objects_ceph'] {
$use_swift = true
} else {
$use_swift = false