x/packstack
Code Issues Proposed changes

Add support for linuxbridge

Browse Source 
Change-Id: I00f904feb3260afe61713d0bce61baa4b0623f24
This commit is contained in:
Terry Wilson
2013-07-01 12:43:13 -05:00
parent 68d4e690f4
commit 7656867cea
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/plugins/quantum_350.py
View File

@@ -278,8 +278,10 @@ def initSequences(controller):
if controller.CONF["CONFIG_QUANTUM_L2_PLUGIN"] == "openvswitch":
controller.CONF['CONFIG_QUANTUM_L2_DBNAME'] = 'ovs_quantum'
controller.CONF['CONFIG_QUANTUM_CORE_PLUGIN'] = 'quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2'
elif controller.CONF["CONFIG_QUANTUM_L2_PLUGIN"] == "linuxbridge":
controller.CONF['CONFIG_QUANTUM_L2_DBNAME'] = 'quantum_linux_bridge'
controller.CONF['CONFIG_QUANTUM_CORE_PLUGIN'] = 'quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2'
global api_hosts, l3_hosts, dhcp_hosts, compute_hosts, meta_hosts, q_hosts
dirty = controller.CONF['CONFIG_QUANTUM_SERVER_HOST'].split(',')
@@ -328,8 +330,8 @@ def createManifest(config):
manifest_data = getManifestTemplate("quantum_ovs_plugin.pp")
appendManifestFile(manifest_file, manifest_data, 'quantum')
elif controller.CONF['CONFIG_QUANTUM_L2_PLUGIN'] == 'linuxbridge':
# Eventually linuxbridge module will need to spearate plugin/agent functionality
pass
manifest_data = getManifestTemplate("quantum_lb_plugin.pp")
appendManifestFile(manifest_file, manifest_data, 'quantum')
def createKeystoneManifest(config):
manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST']

2
packstack/puppet/modules/quantum

Submodule packstack/puppet/modules/quantum updated: 4370cd2af7...894e1871e6

1
packstack/puppet/templates/quantum.pp
View File

@@ -9,5 +9,6 @@ $quantum_user_password = '%(CONFIG_QUANTUM_KS_PW)s'
class { 'quantum':
rpc_backend => 'quantum.openstack.common.rpc.impl_qpid',
qpid_hostname => '%(CONFIG_QPID_HOST)s',
core_plugin => '%(CONFIG_QUANTUM_CORE_PLUGIN)s',
verbose => true,
}

1
packstack/puppet/templates/quantum_lb_agent.pp
View File

@@ -1,2 +1,3 @@
class {'quantum::agents::linuxbridge':
physical_interface_mappings => '%(CONFIG_QUANTUM_LB_INTERFACE_MAPPINGS)s',
}

5
packstack/puppet/templates/quantum_lb_plugin.pp Normal file
View File

@@ -0,0 +1,5 @@
class { 'quantum::plugins::linuxbridge':
tenant_network_type => '%(CONFIG_QUANTUM_LB_TENANT_NETWORK_TYPE)s',
network_vlan_ranges => '%(CONFIG_QUANTUM_LB_VLAN_RANGES)s',
sql_connection => $quantum_sql_connection
}