From de4a3b350d2cf81c333b28cebe7d75cf7421083e Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Fri, 2 Aug 2013 17:48:04 +0000 Subject: [PATCH] Removes Unneeded ovs_local_ip Error Message 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 --- manifests/quantum.pp | 5 +---- spec/classes/openstack_all_spec.rb | 3 --- spec/classes/openstack_quantum_spec.rb | 12 ------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/manifests/quantum.pp b/manifests/quantum.pp index db649ce..fcb6336 100644 --- a/manifests/quantum.pp +++ b/manifests/quantum.pp @@ -68,7 +68,7 @@ # # [ovs_local_ip] # 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] # Whether ovs tunnels should be enabled. @@ -233,9 +233,6 @@ class openstack::quantum ( } if $enable_ovs_agent { - if ! $ovs_local_ip { - fail('ovs_local_ip parameter must be set when using ovs agent') - } class { 'quantum::agents::ovs': bridge_uplinks => $bridge_uplinks, bridge_mappings => $bridge_mappings, diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb index 9efe552..f692784 100644 --- a/spec/classes/openstack_all_spec.rb +++ b/spec/classes/openstack_all_spec.rb @@ -71,9 +71,6 @@ describe 'openstack::all' do :bridge_interface => 'eth0' ) 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 context 'with quantum_user_password, quantum_db_password, bridge_interface, and ovs_local_ip set' do diff --git a/spec/classes/openstack_quantum_spec.rb b/spec/classes/openstack_quantum_spec.rb index 0ae9c38..33e0c21 100644 --- a/spec/classes/openstack_quantum_spec.rb +++ b/spec/classes/openstack_quantum_spec.rb @@ -74,18 +74,6 @@ describe 'openstack::quantum' do :local_ip => '10.0.0.2', :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 context 'when dhcp agent is enabled' do