Browse Source

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: Ia4a2ab35efa0e4304b9aba39d59c643848aa123d
Closes-Bug: #1561241
changes/17/391117/4
Alexey Deryugin 3 years ago
parent
commit
71060b4c47
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      deployment/puppet/osnailyfacter/modular/swift/swift.pp
  2. +1
    -1
      tests/noop/spec/hosts/swift/swift_spec.rb

+ 1
- 1
deployment/puppet/osnailyfacter/modular/swift/swift.pp View File

@@ -7,7 +7,7 @@ prepare_network_config($network_scheme)
$swift_hash = hiera_hash('swift_hash')
$swift_master_role = hiera('swift_master_role', 'primary-controller')
$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'))
# todo(sv) replace 'management' to mgmt/memcache
$memcaches_addr_list = values(get_node_to_ipaddr_map_by_network_role(hiera_hash('swift_proxy_caches', {}), 'management'))

+ 1
- 1
tests/noop/spec/hosts/swift/swift_spec.rb View File

@@ -13,7 +13,7 @@ describe manifest do
controllers = primary_controller_nodes + Noop.puppet_function('filter_nodes', nodes, 'role', 'controller')
controller_internal_addresses = Noop.puppet_function('nodes_to_hash', controllers,'name','internal_address')
controller_nodes = Noop.puppet_function('ipsort', controller_internal_addresses.values)
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_min_part_hours = Noop.hiera 'swift_ring_min_part_hours', 1
memcached_servers = controller_nodes.map{ |n| n = n + ':11211' }

Loading…
Cancel
Save