openstack
/
fuel-library
Code Issues Proposed changes

Revert setting local memcached server for swift proxy 

Switch back to using all available mamcached servers, because of
failures during swift testing.

Change-Id: I251b465dadd8ffe9a15b1a7092168d89acd2d72b
Closes-Bug: 1666837
This commit is contained in:
Oleksiy Molchanov 2017-03-02 14:37:00 +02:00
parent f4f1bf3d92
commit f7e609e612
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
View File

@ -13,7 +13,6 @@ class openstack_tasks::swift::proxy_storage {
$swift_host_ip_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('swift_proxies', {}), 'swift/api')
$swift_proxies_addr_list = sorted_hosts($swift_host_ip_map, 'ip', 'ip')
$memcached_servers = hiera('memcached_servers')
$local_memcached_server = hiera('local_memcached_server')
$is_primary_swift_proxy = hiera('is_primary_swift_proxy', false)
$proxy_port = hiera('proxy_port', '8080')
$storage_hash = hiera_hash('storage')
@ -80,7 +79,7 @@ class openstack_tasks::swift::proxy_storage {
class { 'openstack_tasks::swift::parts::proxy':
swift_user_password => $swift_hash['user_password'],
swift_operator_roles => $swift_operator_roles,
memcached_servers => $local_memcached_server,
memcached_servers => $memcached_servers,
ring_part_power => $ring_part_power,
ring_replicas => $ring_replicas,
primary_proxy => $is_primary_swift_proxy,

5
tests/noop/spec/hosts/swift/proxy_storage_spec.rb
View File

@ -14,7 +14,6 @@ describe manifest do
network_scheme = Noop.hiera_hash 'network_scheme'
let(:memcached_servers) { Noop.hiera 'memcached_servers' }
let(:local_memcached_server) { Noop.hiera 'local_memcached_server' }
management_vip = Noop.hiera('management_vip')
swift_operator_roles = storage_hash.fetch('swift_operator_roles', ['admin', 'SwiftOperator', '_member_'])
@ -104,7 +103,7 @@ describe manifest do
it 'should declare swift::proxy::cache class with correct memcache_servers parameter' do
should contain_class('swift::proxy::cache').with(
'memcache_servers' => local_memcached_server,
'memcache_servers' => memcached_servers,
)
end
@ -171,7 +170,7 @@ describe manifest do
it 'should contain memcached params' do
should contain_class('openstack_tasks::swift::parts::proxy').with(
:memcached_servers => local_memcached_server
:memcached_servers => memcached_servers
)
end