Enable swift when there is no RadosGW

There is a regression after
If319845aa9f2d9b3ca07936350ef374f504679cb.
According to current logic RadosGW and Swift can be installed
in a same time.

That commit changes logic. If we have RadosGW, then we have no
Swift. If we have no RadosGW, then we have Swift.

Change-Id: I2e41551dc7df9f3be81df26000b1ae2bb7d76b39
Closes-Bug: #1604879
This commit is contained in:
Anton Chevychalov 2017-04-21 15:32:18 +03:00
parent d60caaf647
commit 285c29cf12
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'] or !$storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
if !$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'] or !$storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
if !$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 or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
condition: "settings:storage.objects_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 or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
condition: "settings:storage.objects_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 or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
condition: "settings:storage.objects_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 or settings:storage.images_ceph.value == false) and settings:storage.images_vcenter.value == false"
condition: "settings:storage.objects_ceph.value == false and settings:storage.images_vcenter.value == false"
cross-depends:
- name: keystone
requires: [primary-keystone, keystone]