openstack/fuel-library
Code Issues Proposed changes

Merge "Increase timeout for connecting to neutron" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins 2017-01-02 15:48:56 +00:00 committed by Gerrit Code Review
commit fa52b34340
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack_tasks/manifests/openstack_network/server_nova.pp
View File

@ -35,6 +35,7 @@ class openstack_tasks::openstack_network::server_nova {
neutron_username => $admin_username,
neutron_auth_url => $neutron_auth_url,
neutron_url => $neutron_url,
neutron_url_timeout => '60',
neutron_ovs_bridge => $neutron_ovs_bridge,
}

3
tests/noop/spec/hosts/openstack-network/server-nova_spec.rb
View File

@ -46,6 +46,9 @@ describe manifest do
it { should contain_class('nova::network::neutron').with(
'neutron_ovs_bridge' => 'br-int'
)}
it { should contain_class('nova::network::neutron').with(
'neutron_url_timeout' => '60'
)}
if Noop.hiera_structure('use_ssl', false)
context 'with overridden TLS' do