stackforge/puppet-openstack
Code Issues Proposed changes

Removes Unneeded ovs_local_ip Error Message

Browse Source 
Previously, the openstack::quantum class would give an error
message when enable_ovs_agent was true and no local_ip was set.

The error has been removed since it is handled by the Quantum
module.

Change-Id: I4ba9c48b44b3733b44b7ba9c7e863ca74892feb5
This commit is contained in:
Daneyon Hansen
2013-08-02 17:48:04 +00:00
parent 8c188d7ed7
commit de4a3b350d
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/quantum.pp
View File

@@ -68,7 +68,7 @@
# #
# [ovs_local_ip] # [ovs_local_ip]
# Ip address to use for tunnel endpoint. # Ip address to use for tunnel endpoint.
# Only required when ovs is enabled. No default. # Only required when tenant_network_type is 'gre'. No default.
# #
# [ovs_enable_tunneling] # [ovs_enable_tunneling]
# Whether ovs tunnels should be enabled. # Whether ovs tunnels should be enabled.
@@ -233,9 +233,6 @@ class openstack::quantum (
} }
if $enable_ovs_agent { if $enable_ovs_agent {
if ! $ovs_local_ip {
fail('ovs_local_ip parameter must be set when using ovs agent')
}
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
bridge_uplinks => $bridge_uplinks, bridge_uplinks => $bridge_uplinks,
bridge_mappings => $bridge_mappings, bridge_mappings => $bridge_mappings,

3
spec/classes/openstack_all_spec.rb
View File

@@ -71,9 +71,6 @@ describe 'openstack::all' do
:bridge_interface => 'eth0' :bridge_interface => 'eth0'
) )
end end
it 'raises an error if no ovs_local_ip is set' do
expect { subject }.to raise_error(Puppet::Error, /ovs_local_ip parameter must be set when using ovs agent/)
end
end end
context 'with quantum_user_password, quantum_db_password, bridge_interface, and ovs_local_ip set' do context 'with quantum_user_password, quantum_db_password, bridge_interface, and ovs_local_ip set' do

12
spec/classes/openstack_quantum_spec.rb
View File

@@ -74,18 +74,6 @@ describe 'openstack::quantum' do
:local_ip => '10.0.0.2', :local_ip => '10.0.0.2',
:firewall_driver => 'quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' :firewall_driver => 'quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)} )}
context 'without ovs_local_ip' do
before do
params.delete(:ovs_local_ip)
end
it 'should fail' do
expect do
subject
end.to raise_error(Puppet::Error, /ovs_local_ip parameter must be set/)
end
end
end end
context 'when dhcp agent is enabled' do context 'when dhcp agent is enabled' do