openstack/fuel-library
Code Issues Proposed changes

Move port reservation to dedicated granular

Browse Source 
Change-Id: I49d91ee42d7ca504eb315de8c17f4cb5263d423a
Closes-Bug: #1530307
This commit is contained in:
Bartosz Kupidura 2016-01-12 12:17:45 +01:00
parent 9a8dae5941
commit 324fc466b5
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp
View File

@ -22,10 +22,6 @@ notify {'SDN': message => $sdn }
sysctl::value { 'net.ipv4.conf.all.arp_accept': value => '1' }
sysctl::value { 'net.ipv4.conf.default.arp_accept': value => '1' }
# setting kernel reserved ports
# defaults are 49000,49001,35357,41055,41056,58882
class { 'openstack::reserved_ports': }
### TCP connections keepalives and failover related parameters ###
# configure TCP keepalive for host OS.
# Send 3 probes each 8 seconds, if the connection was idle

5
deployment/puppet/osnailyfacter/modular/netconfig/reserved_ports.pp Normal file
View File

@ -0,0 +1,5 @@
notice('MODULAR: reserved_ports.pp')
# setting kernel reserved ports
# defaults are 49000,49001,35357,41055,41056,58882
class { 'openstack::reserved_ports': }

12
deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
View File

@ -26,3 +26,15 @@
puppet_modules: /etc/puppet/modules
timeout: 3600
cwd: /
- id: reserved_ports
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
required_for: [globals]
reexecute_on: [deploy_changes]
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/reserved_ports.pp
puppet_modules: /etc/puppet/modules
timeout: 180
cwd: /

1
tests/noop/spec/hosts/netconfig/netconfig_spec.rb
View File

@ -14,7 +14,6 @@ describe manifest do
it { should contain_class('l23network').with('use_ovs' => use_neutron) }
it { should contain_sysctl__value('net.ipv4.conf.all.arp_accept').with('value' => '1') }
it { should contain_sysctl__value('net.ipv4.conf.default.arp_accept').with('value' => '1') }
it { should contain_class('openstack::reserved_ports') }
it { should contain_class('openstack::keepalive').with(
'tcpka_time' => '30',
'tcpka_probes' => '8',

12
tests/noop/spec/hosts/netconfig/reserved_ports_spec.rb Normal file
View File

@ -0,0 +1,12 @@
require 'spec_helper'
require 'shared-examples'
manifest = 'netconfig/reserved_ports.pp'
describe manifest do
shared_examples 'catalog' do
it { should contain_class('openstack::reserved_ports') }
end
test_ubuntu_and_centos manifest
end