From 05abd35675542c8242a690cbbea5202f018dc450 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Fri, 27 Nov 2015 18:55:54 +0300 Subject: [PATCH] Fix noop tests for openstack-haproxy-swift Change-Id: I7ee2a5566426a7eb1d1645660f285a988251d446 Closes-bug: #1520632 --- .../hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb index 72dfcd8c41..fa4db549a4 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb @@ -16,17 +16,15 @@ describe manifest do else use_swift = true end - use_swift = Noop.hiera_structure('swift/enabled', false) if use_swift it "should properly configure swift haproxy based on ssl" do public_ssl_swift = Noop.hiera_structure('public_ssl/services', false) should contain_openstack__ha__haproxy_service('swift').with( 'order' => '120', - 'listen_port' => 8777, + 'listen_port' => 8080, 'public' => true, 'public_ssl' => public_ssl_swift, - 'require_service' => 'swift-api', 'haproxy_config_options' => { 'option' => ['httpchk', 'httplog', 'httpclose'], 'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }', @@ -47,7 +45,7 @@ describe manifest do it 'should declare openstack::ha::haproxy_service with name swift-baremetal' do should contain_openstack__ha__haproxy_service('swift-baremetal').with( 'order' => '125', - 'listen_port' => 8777, + 'listen_port' => 8080, 'public_virtual_ip' => false, 'internal_virtual_ip' => baremetal_virtual_ip, 'haproxy_config_options' => {