From c519110c6e44ce711930483b736375e233089c63 Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Mon, 5 Aug 2013 03:38:57 +0000 Subject: [PATCH] Allow ovs_enable_tunneling to be Passed Through Previously, the openstack::compute class did not pass the ovs_enable_tunneling parameter. Now that the module supports Provider Networking, ovs_enable_tunneling must be configurable to allow users to disable tunneling when using VLAN networking. Adds parameter ovs_enable_tunneling, which defaults to true. Change-Id: I73d659d5857b71448e5d5d0ddc65fa79ce8f1d95 --- manifests/compute.pp | 40 +++++++++++++++----------- spec/classes/openstack_compute_spec.rb | 34 +++++++++++----------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index ff4528d..f7204f6 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -11,6 +11,10 @@ # Driver used to implement Quantum firewalling. # (optional) Defaults to false. # +# [ovs_enable_tunneling] +# Enable/disable the Quantum OVS GRE tunneling networking mode. +# Optional. Defaults to true. +# # [rabbit_hosts] An array of IP addresses or Virttual IP address for connecting to a RabbitMQ Cluster. # Optional. Defaults to false. # @@ -54,6 +58,7 @@ class openstack::compute ( $quantum_auth_url = 'http://127.0.0.1:35357/v2.0', $keystone_host = '127.0.0.1', $quantum_host = '127.0.0.1', + $ovs_enable_tunneling = true, $ovs_local_ip = false, $quantum_firewall_driver = false, $bridge_mappings = undef, @@ -203,29 +208,30 @@ class openstack::compute ( class { 'openstack::quantum': # Database - db_host => $db_host, + db_host => $db_host, # Networking - ovs_local_ip => $ovs_local_ip_real, + ovs_local_ip => $ovs_local_ip_real, # Rabbit - rabbit_host => $rabbit_host, - rabbit_user => $rabbit_user, - rabbit_password => $rabbit_password, + rabbit_host => $rabbit_host, + rabbit_user => $rabbit_user, + rabbit_password => $rabbit_password, # Quantum OVS - enable_ovs_agent => $enable_ovs_agent, - firewall_driver => $quantum_firewall_driver, + enable_ovs_agent => $enable_ovs_agent, + ovs_enable_tunneling => $ovs_enable_tunneling, + firewall_driver => $quantum_firewall_driver, # Quantum L3 Agent - enable_l3_agent => $enable_l3_agent, - enable_dhcp_agent => $enable_dhcp_agent, - auth_url => $quantum_auth_url, - user_password => $quantum_user_password, + enable_l3_agent => $enable_l3_agent, + enable_dhcp_agent => $enable_dhcp_agent, + auth_url => $quantum_auth_url, + user_password => $quantum_user_password, # Keystone - keystone_host => $keystone_host, + keystone_host => $keystone_host, # General - enabled => $enabled, - enable_server => false, - verbose => $verbose, - bridge_mappings => $bridge_mappings, - bridge_uplinks => $bridge_uplinks + enabled => $enabled, + enable_server => false, + verbose => $verbose, + bridge_mappings => $bridge_mappings, + bridge_uplinks => $bridge_uplinks } class { 'nova::compute::quantum': diff --git a/spec/classes/openstack_compute_spec.rb b/spec/classes/openstack_compute_spec.rb index a43d252..7eb34a2 100644 --- a/spec/classes/openstack_compute_spec.rb +++ b/spec/classes/openstack_compute_spec.rb @@ -278,6 +278,7 @@ describe 'openstack::compute' do :quantum => true, :keystone_host => '127.0.0.3', :quantum_host => '127.0.0.2', + :ovs_enable_tunneling => true, :quantum_user_password => 'quantum_user_password', :quantum_firewall_driver => false ) @@ -285,22 +286,23 @@ describe 'openstack::compute' do it 'should configure quantum' do should contain_class('openstack::quantum').with( - :db_host => '127.0.0.1', - :ovs_local_ip => params[:internal_address], - :rabbit_host => params[:rabbit_host], - :rabbit_hosts => params[:rabbit_hosts], - :rabbit_user => 'openstack', - :rabbit_password => params[:rabbit_password], - :enable_ovs_agent => true, - :firewall_driver => params[:quantum_firewall_driver], - :enable_l3_agent => false, - :enable_dhcp_agent => false, - :auth_url => 'http://127.0.0.1:35357/v2.0', - :user_password => params[:quantum_user_password], - :keystone_host => params[:keystone_host], - :enabled => true, - :enable_server => false, - :verbose => false + :db_host => '127.0.0.1', + :ovs_local_ip => params[:internal_address], + :rabbit_host => params[:rabbit_host], + :rabbit_hosts => params[:rabbit_hosts], + :rabbit_user => 'openstack', + :rabbit_password => params[:rabbit_password], + :enable_ovs_agent => true, + :ovs_enable_tunneling => params[:ovs_enable_tunneling], + :firewall_driver => params[:quantum_firewall_driver], + :enable_l3_agent => false, + :enable_dhcp_agent => false, + :auth_url => 'http://127.0.0.1:35357/v2.0', + :user_password => params[:quantum_user_password], + :keystone_host => params[:keystone_host], + :enabled => true, + :enable_server => false, + :verbose => false ) should contain_class('nova::compute::quantum').with(