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 e28636fb45
commit fdbc795c87
3 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ $ironic_hash = hiera_hash('ironic', {})
$external_lb = hiera('external_lb', false)
if !$external_lb {
if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph'] and !$storage_hash['images_vcenter']) {
if (!$storage_hash['images_ceph'] or !$storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
$use_swift = true
} else {
$use_swift = false

View File

@ -16,7 +16,7 @@ $ironic_hash = hiera_hash('ironic', {})
$external_lb = hiera('external_lb', false)
if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph'] and !$storage_hash['images_vcenter']) {
if (!$storage_hash['images_ceph'] or !$storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
$use_swift = true
} else {
$use_swift = false

View File

@ -4,7 +4,7 @@
groups: [controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
condition: "settings:storage.objects_ceph.value == false and settings:storage.images_ceph.value == false and settings:storage.images_vcenter.value == false"
condition: "(settings:storage.objects_ceph.value == false or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
cross-depends:
- name: primary-swift
parameters:
@ -22,7 +22,7 @@
groups: [primary-controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
condition: "settings:storage.objects_ceph.value == false and settings:storage.images_ceph.value == false and settings:storage.images_vcenter.value == false"
condition: "(settings:storage.objects_ceph.value == false or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
cross-depends:
- name: /(primary-)?rabbitmq/
- name: swift-keystone
@ -42,7 +42,7 @@
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [primary-swift, swift]
condition: "settings:storage.objects_ceph.value == false and settings:storage.images_ceph.value == false and settings:storage.images_vcenter.value == false"
condition: "(settings:storage.objects_ceph.value == false or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
cross-depends:
- name: /(primary-)?swift/
role: self
@ -60,7 +60,7 @@
version: 2.0.0
groups: [primary-controller]
required_for: [primary-swift]
condition: "settings:storage.objects_ceph.value == false and settings:storage.images_ceph.value == false and settings:storage.images_vcenter.value == false"
condition: "(settings:storage.objects_ceph.value == false or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
cross-depends:
- name: keystone
requires: [primary-keystone, keystone]