openstack
/
fuel-library
Code Issues Proposed changes

Add _member_ role to Swift operator list 

Newly created users unable to interract with Swift by default,
to fix this, we need to add _member_ role to Swift operator list.

Change-Id: Ia4a2ab35efa0e4304b9aba39d59c643848aa123e
Closes-Bug: #1561241
(cherry picked from commit 6c8d10130b)
This commit is contained in:
Alexey Deryugin 2016-04-29 12:36:50 +00:00 committed by Sergii Golovatiuk
parent 9f3d7e63b4
commit d4946028b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/swift/proxy.pp
View File

@ -9,7 +9,7 @@ class openstack_tasks::swift::proxy {
$swift_hash = hiera_hash('swift') $swift_hash = hiera_hash('swift')
$swift_master_role = hiera('swift_master_role', 'primary-controller') $swift_master_role = hiera('swift_master_role', 'primary-controller')
$swift_nodes = hiera_hash('swift_nodes', {}) $swift_nodes = hiera_hash('swift_nodes', {})
$swift_operator_roles = pick($swift_hash['swift_operator_roles'], ['admin', 'SwiftOperator']) $swift_operator_roles = pick($swift_hash['swift_operator_roles'], ['admin', 'SwiftOperator', '_member_'])
$swift_proxies_addr_list = values(get_node_to_ipaddr_map_by_network_role(hiera_hash('swift_proxies', {}), 'swift/api')) $swift_proxies_addr_list = values(get_node_to_ipaddr_map_by_network_role(hiera_hash('swift_proxies', {}), 'swift/api'))
$memcaches_addr_list = hiera('memcached_addresses') $memcaches_addr_list = hiera('memcached_addresses')
$is_primary_swift_proxy = hiera('is_primary_swift_proxy', false) $is_primary_swift_proxy = hiera('is_primary_swift_proxy', false)

2
tests/noop/spec/hosts/swift/proxy_spec.rb
View File

@ -18,7 +18,7 @@ describe manifest do
memcached_port = Noop.hiera 'memcache_server_port', '11211' memcached_port = Noop.hiera 'memcache_server_port', '11211'
memcached_servers = memcached_addresses.map{ |n| n = n + ':' + memcached_port } memcached_servers = memcached_addresses.map{ |n| n = n + ':' + memcached_port }
swift_operator_roles = storage_hash.fetch('swift_operator_roles', ['admin', 'SwiftOperator']) swift_operator_roles = storage_hash.fetch('swift_operator_roles', ['admin', 'SwiftOperator', '_member_'])
ring_part_power = swift_hash.fetch('ring_part_power', 10) ring_part_power = swift_hash.fetch('ring_part_power', 10)
ring_min_part_hours = Noop.hiera 'swift_ring_min_part_hours', 1 ring_min_part_hours = Noop.hiera 'swift_ring_min_part_hours', 1
deploy_swift_proxy = Noop.hiera('deploy_swift_proxy') deploy_swift_proxy = Noop.hiera('deploy_swift_proxy')