stackforge/puppet-openstack
Code Issues Proposed changes

Allow ovs_enable_tunneling to be Passed Through

Browse Source 
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
This commit is contained in:
Daneyon Hansen
2013-08-05 03:38:57 +00:00
parent 01d142f156
commit c519110c6e
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
manifests/compute.pp
View File

@@ -11,6 +11,10 @@
# Driver used to implement Quantum firewalling. # Driver used to implement Quantum firewalling.
# (optional) Defaults to false. # (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. # [rabbit_hosts] An array of IP addresses or Virttual IP address for connecting to a RabbitMQ Cluster.
# Optional. Defaults to false. # Optional. Defaults to false.
# #
@@ -54,6 +58,7 @@ class openstack::compute (
$quantum_auth_url = 'http://127.0.0.1:35357/v2.0', $quantum_auth_url = 'http://127.0.0.1:35357/v2.0',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$quantum_host = '127.0.0.1', $quantum_host = '127.0.0.1',
$ovs_enable_tunneling = true,
$ovs_local_ip = false, $ovs_local_ip = false,
$quantum_firewall_driver = false, $quantum_firewall_driver = false,
$bridge_mappings = undef, $bridge_mappings = undef,
@@ -203,29 +208,30 @@ class openstack::compute (
class { 'openstack::quantum': class { 'openstack::quantum':
# Database # Database
db_host => $db_host, db_host => $db_host,
# Networking # Networking
ovs_local_ip => $ovs_local_ip_real, ovs_local_ip => $ovs_local_ip_real,
# Rabbit # Rabbit
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
# Quantum OVS # Quantum OVS
enable_ovs_agent => $enable_ovs_agent, enable_ovs_agent => $enable_ovs_agent,
firewall_driver => $quantum_firewall_driver, ovs_enable_tunneling => $ovs_enable_tunneling,
firewall_driver => $quantum_firewall_driver,
# Quantum L3 Agent # Quantum L3 Agent
enable_l3_agent => $enable_l3_agent, enable_l3_agent => $enable_l3_agent,
enable_dhcp_agent => $enable_dhcp_agent, enable_dhcp_agent => $enable_dhcp_agent,
auth_url => $quantum_auth_url, auth_url => $quantum_auth_url,
user_password => $quantum_user_password, user_password => $quantum_user_password,
# Keystone # Keystone
keystone_host => $keystone_host, keystone_host => $keystone_host,
# General # General
enabled => $enabled, enabled => $enabled,
enable_server => false, enable_server => false,
verbose => $verbose, verbose => $verbose,
bridge_mappings => $bridge_mappings, bridge_mappings => $bridge_mappings,
bridge_uplinks => $bridge_uplinks bridge_uplinks => $bridge_uplinks
} }
class { 'nova::compute::quantum': class { 'nova::compute::quantum':

34
spec/classes/openstack_compute_spec.rb
View File

@@ -278,6 +278,7 @@ describe 'openstack::compute' do
:quantum => true, :quantum => true,
:keystone_host => '127.0.0.3', :keystone_host => '127.0.0.3',
:quantum_host => '127.0.0.2', :quantum_host => '127.0.0.2',
:ovs_enable_tunneling => true,
:quantum_user_password => 'quantum_user_password', :quantum_user_password => 'quantum_user_password',
:quantum_firewall_driver => false :quantum_firewall_driver => false
) )
@@ -285,22 +286,23 @@ describe 'openstack::compute' do
it 'should configure quantum' do it 'should configure quantum' do
should contain_class('openstack::quantum').with( should contain_class('openstack::quantum').with(
:db_host => '127.0.0.1', :db_host => '127.0.0.1',
:ovs_local_ip => params[:internal_address], :ovs_local_ip => params[:internal_address],
:rabbit_host => params[:rabbit_host], :rabbit_host => params[:rabbit_host],
:rabbit_hosts => params[:rabbit_hosts], :rabbit_hosts => params[:rabbit_hosts],
:rabbit_user => 'openstack', :rabbit_user => 'openstack',
:rabbit_password => params[:rabbit_password], :rabbit_password => params[:rabbit_password],
:enable_ovs_agent => true, :enable_ovs_agent => true,
:firewall_driver => params[:quantum_firewall_driver], :ovs_enable_tunneling => params[:ovs_enable_tunneling],
:enable_l3_agent => false, :firewall_driver => params[:quantum_firewall_driver],
:enable_dhcp_agent => false, :enable_l3_agent => false,
:auth_url => 'http://127.0.0.1:35357/v2.0', :enable_dhcp_agent => false,
:user_password => params[:quantum_user_password], :auth_url => 'http://127.0.0.1:35357/v2.0',
:keystone_host => params[:keystone_host], :user_password => params[:quantum_user_password],
:enabled => true, :keystone_host => params[:keystone_host],
:enable_server => false, :enabled => true,
:verbose => false :enable_server => false,
:verbose => false
) )
should contain_class('nova::compute::quantum').with( should contain_class('nova::compute::quantum').with(