From d4946028b4149507438216e24f863241a6879b87 Mon Sep 17 00:00:00 2001 From: Alexey Deryugin Date: Fri, 29 Apr 2016 12:36:50 +0000 Subject: [PATCH] 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 6c8d10130b7658b733d7b56ea54cc7933a9f5857) --- deployment/puppet/openstack_tasks/manifests/swift/proxy.pp | 2 +- tests/noop/spec/hosts/swift/proxy_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/openstack_tasks/manifests/swift/proxy.pp b/deployment/puppet/openstack_tasks/manifests/swift/proxy.pp index b26f00f786..9f844d82cb 100644 --- a/deployment/puppet/openstack_tasks/manifests/swift/proxy.pp +++ b/deployment/puppet/openstack_tasks/manifests/swift/proxy.pp @@ -9,7 +9,7 @@ class openstack_tasks::swift::proxy { $swift_hash = hiera_hash('swift') $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')) $memcaches_addr_list = hiera('memcached_addresses') $is_primary_swift_proxy = hiera('is_primary_swift_proxy', false) diff --git a/tests/noop/spec/hosts/swift/proxy_spec.rb b/tests/noop/spec/hosts/swift/proxy_spec.rb index 7bd2845d47..2eeb90492c 100644 --- a/tests/noop/spec/hosts/swift/proxy_spec.rb +++ b/tests/noop/spec/hosts/swift/proxy_spec.rb @@ -18,7 +18,7 @@ describe manifest do memcached_port = Noop.hiera 'memcache_server_port', '11211' 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_min_part_hours = Noop.hiera 'swift_ring_min_part_hours', 1 deploy_swift_proxy = Noop.hiera('deploy_swift_proxy')