stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: update manifests to last ref

Browse Source 
- Update refs to master branch from puppet-neutron
- Make tests work with metadata agent
This commit is contained in:
Emilien Macchi 2014-06-27 02:27:28 +02:00
parent a7bbff7dfc
commit 971e8efa30
11 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@ -20,7 +20,7 @@ fixtures:
ref: 'f7d1385d6990492705ddaa228ffa544ca235913a'
'neutron':
repo: 'git://github.com/enovance/puppet-neutron'
ref: 'd59bf66836e42d8ddf5e8a32c46abd89b61b17c6'
ref: 'cfd0abbab040fe75144f4e7814de530bfbf4c538'
'ceilometer':
repo: 'git://github.com/enovance/puppet-ceilometer'
ref: '166b00a773bb2830175bd61a451294d757453eb3'

2
Puppetfile
View File

@ -37,7 +37,7 @@ mod 'keystone',
:ref => 'cf77bb23c059416b2d00a37f96a339f06d8c1e2c'
mod 'neutron',
:git => 'git://github.com/enovance/puppet-neutron.git',
:ref => 'd59bf66836e42d8ddf5e8a32c46abd89b61b17c6'
:ref => 'cfd0abbab040fe75144f4e7814de530bfbf4c538'
mod 'nova',
:git => 'git://github.com/enovance/puppet-nova.git',
:ref => 'ca16cbf55cfa3d2b62c7a78431fa75aadae97af4'

20
manifests/network.pp
View File

@ -141,8 +141,7 @@ class cloud::network(
tunnel_id_ranges => ['1:10000'],
flat_networks => $flat_networks,
mechanism_drivers => ['openvswitch','l2population'],
enable_security_group => true,
firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
enable_security_group => true
}
# TODO(EmilienM) Temporary, need to be fixed upstream.
@ -150,14 +149,15 @@ class cloud::network(
# config file, only ML2. I need to patch puppet-neutron.
# Follow-up: https://github.com/enovance/puppet-openstack-cloud/issues/199
neutron_plugin_ml2 {
'agent/tunnel_types': value => ['gre'];
'agent/l2_population': value => true;
'agent/polling_interval': value => '15';
'OVS/local_ip': value => $tunnel_eth;
'OVS/enable_tunneling': value => true;
'OVS/integration_bridge': value => 'br-int';
'OVS/tunnel_bridge': value => 'br-tun';
'OVS/bridge_mappings': value => $provider_bridge_mappings;
'agent/tunnel_types': value => ['gre'];
'agent/l2_population': value => true;
'agent/polling_interval': value => '15';
'OVS/local_ip': value => $tunnel_eth;
'OVS/enable_tunneling': value => true;
'OVS/integration_bridge': value => 'br-int';
'OVS/tunnel_bridge': value => 'br-tun';
'OVS/bridge_mappings': value => $provider_bridge_mappings;
'securitygroup/firewall_driver': value => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver';
}
# TODO(EmilienM), Temporary, it's a bug in Debian packages. GH#342

1
manifests/network/metadata.pp
View File

@ -44,7 +44,6 @@ class cloud::network::metadata(
}
neutron_metadata_agent_config {
'DEFAULT/metadata_backlog': value => '4096';
'DEFAULT/nova_metadata_protocol': value => $ks_nova_internal_proto;
}

3
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -164,8 +164,7 @@ describe 'cloud::compute::hypervisor' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end

3
spec/classes/cloud_network_controller_spec.rb
View File

@ -89,8 +89,7 @@ describe 'cloud::network::controller' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end

3
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -77,8 +77,7 @@ describe 'cloud::network::dhcp' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end

3
spec/classes/cloud_network_l3_spec.rb
View File

@ -77,8 +77,7 @@ describe 'cloud::network::l3' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end

3
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -77,8 +77,7 @@ describe 'cloud::network::lbaas' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end

4
spec/classes/cloud_network_metadata_spec.rb
View File

@ -85,8 +85,7 @@ describe 'cloud::network::metadata' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end
@ -102,7 +101,6 @@ describe 'cloud::network::metadata' do
:auth_region => 'MyRegion',
:metadata_workers => '8'
)
should contain_neutron_metadata_agent_config('DEFAULT/metadata_backlog').with(:value => '4096')
should contain_neutron_metadata_agent_config('DEFAULT/nova_metadata_protocol').with(:value => 'https')
end

3
spec/classes/cloud_network_vpn_spec.rb
View File

@ -72,8 +72,7 @@ describe 'cloud::network::vpn' do
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:flat_networks => ['public'],
:enable_security_group => true,
:firewall_driver => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
:enable_security_group => true
)
should_not contain__neutron_network('public')
end