openstack
/
fuel-library
Code Issues Proposed changes

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 a95be31fa6
commit 987b3a6af7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-radosgw.pp
View File

@ -5,7 +5,7 @@ $storage_hash = hiera_hash('storage', {})
$public_ssl_hash = hiera('public_ssl')
if (!$storage_hash['images_ceph'] and !$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

2
deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-swift.pp
View File

@ -5,7 +5,7 @@ $storage_hash = hiera_hash('storage', {})
$swift_proxies = hiera_hash('swift_proxies', undef)
$public_ssl_hash = hiera('public_ssl')
if (!$storage_hash['images_ceph'] and !$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

6
deployment/puppet/osnailyfacter/modular/swift/tasks.yaml
View File

@ -3,7 +3,7 @@
groups: [primary-controller, 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 and settings:storage.images_vcenter.value == false"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/swift/swift.pp
puppet_modules: /etc/puppet/modules
@ -18,7 +18,7 @@
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [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 and settings:storage.images_vcenter.value == false"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/swift/rebalance_cronjob.pp
puppet_modules: /etc/puppet/modules
@ -33,7 +33,7 @@
groups: [primary-controller]
required_for: [swift]
requires: [keystone]
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 and settings:storage.images_vcenter.value == false"
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/swift/keystone.pp
puppet_modules: /etc/puppet/modules