openstack
/
fuel-library
Code Issues Proposed changes

Merge "Correct logical expressions for storage backends" into stable/newton

This commit is contained in:
Jenkins 2017-06-19 08:57:07 +00:00 committed by Gerrit Code Review
parent 98154bff02 9e3e2da305
commit 459c52c8e2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
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:
@ -83,7 +83,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:

2
deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
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

2
deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
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