summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Rizvan <srizvan@mirantis.com>2017-04-11 20:12:37 +0300
committerSergii Rizvan <srizvan@mirantis.com>2017-05-17 14:11:16 +0000
commit57bb7299b75ab5f9457878cc0bfb88af74ed767a (patch)
tree2cc72c68a0c253362f70663d9937b108bb6fbe03
parent34528808804ed3edd822f20ce141adae421b12b9 (diff)
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
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Michael Polenchuk <mpolenchuk@mirantis.com> Code-Review+2: Stanislaw Bogatkin <sbogatkin@mirantis.com> Workflow+1: Vladimir Kuklin <vkuklin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 26 May 2017 11:40:27 +0000 Reviewed-on: https://review.openstack.org/465595 Project: openstack/fuel-library Branch: refs/heads/master
-rw-r--r--deployment/puppet/openstack_tasks/examples/swift/tasks.yaml6
-rw-r--r--deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp2
-rw-r--r--deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp2
3 files changed, 5 insertions, 5 deletions
diff --git a/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml b/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
index 1b60147..539ed2b 100644
--- a/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
+++ b/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
@@ -6,7 +6,7 @@
6 requires: [openstack-controller, memcached] 6 requires: [openstack-controller, memcached]
7 condition: 7 condition:
8 yaql_exp: &swift_enabled > 8 yaql_exp: &swift_enabled >
9 (not $.storage.objects_ceph and not $.storage.images_ceph) and 9 not $.storage.objects_ceph and
10 (changedAny($.network_scheme, $.network_metadata, $.swift, 10 (changedAny($.network_scheme, $.network_metadata, $.swift,
11 $.get('swift_master_role', 'primary-controller'), 11 $.get('swift_master_role', 'primary-controller'),
12 $.get('swift_object_roles'), ('primary-controller' in $.roles), 12 $.get('swift_object_roles'), ('primary-controller' in $.roles),
@@ -63,7 +63,7 @@
63 requires: [swift-proxy_storage, primary-swift-proxy_storage] 63 requires: [swift-proxy_storage, primary-swift-proxy_storage]
64 condition: 64 condition:
65 yaql_exp: > 65 yaql_exp: >
66 (not $.storage.objects_ceph and not $.storage.images_ceph) and 66 not $.storage.objects_ceph and
67 (changedAny($.storage, $.get('swift_master_role', 'primary-controller'), 67 (changedAny($.storage, $.get('swift_master_role', 'primary-controller'),
68 $.get('swift_ring_min_part_hours'),('primary-controller' in $.roles))) 68 $.get('swift_ring_min_part_hours'),('primary-controller' in $.roles)))
69 parameters: 69 parameters:
@@ -84,7 +84,7 @@
84 - name: swift-proxy_storage 84 - name: swift-proxy_storage
85 condition: 85 condition:
86 yaql_exp: > 86 yaql_exp: >
87 (not $.storage.objects_ceph and not $.storage.images_ceph) and 87 not $.storage.objects_ceph and
88 (changedAny($.swift, $.network_metadata.vips, 88 (changedAny($.swift, $.network_metadata.vips,
89 $.get('region', 'RegionOne'), $.public_ssl, $.get('use_ssl'))) 89 $.get('region', 'RegionOne'), $.public_ssl, $.get('use_ssl')))
90 parameters: 90 parameters:
diff --git a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
index 48bc80a..3f5f558 100644
--- a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
+++ b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
@@ -12,7 +12,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_radosgw {
12 $external_lb = hiera('external_lb', false) 12 $external_lb = hiera('external_lb', false)
13 13
14 if !$external_lb { 14 if !$external_lb {
15 if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) { 15 if !$storage_hash['objects_ceph'] {
16 $use_swift = true 16 $use_swift = true
17 } else { 17 } else {
18 $use_swift = false 18 $use_swift = false
diff --git a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
index 924ee10..8f27577 100644
--- a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
+++ b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
@@ -15,7 +15,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_swift {
15 15
16 $external_lb = hiera('external_lb', false) 16 $external_lb = hiera('external_lb', false)
17 17
18 if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) { 18 if !$storage_hash['objects_ceph'] {
19 $use_swift = true 19 $use_swift = true
20 } else { 20 } else {
21 $use_swift = false 21 $use_swift = false