x/solar
Code Issues Proposed changes

Fix core plugin, remove external class ref for neutron

Browse Source 
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-08-05 16:21:33 +02:00
parent 26bf28ffc8
commit 956261f31a
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
example-puppet.py
View File

@ -159,7 +159,9 @@ def setup_resources():
# NEUTRON # NEUTRON
# Deploy chain neutron -> (plugins) -> neutron_server -> ( agents ) # Deploy chain neutron -> (plugins) -> neutron_server -> ( agents )
neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {})[0] neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {
'core_plugin': 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2'
})[0]
signals.connect(node1, neutron_puppet) signals.connect(node1, neutron_puppet)
signals.connect(rabbitmq_service1, neutron_puppet, { signals.connect(rabbitmq_service1, neutron_puppet, {
'ip': 'rabbit_host', 'ip': 'rabbit_host',
@ -258,7 +260,8 @@ def setup_resources():
signals.connect(neutron_puppet, neutron_puppet2, { signals.connect(neutron_puppet, neutron_puppet2, {
'rabbit_host', 'rabbit_port', 'rabbit_host', 'rabbit_port',
'rabbit_user', 'rabbit_password', 'rabbit_user', 'rabbit_password',
'rabbit_virtual_host', 'package_ensure', 'rabbit_virtual_host',
'package_ensure', 'core_plugin',
}) })
# NEUTRON OVS PLUGIN & AGENT WITH GRE FOR COMPUTE (node2) # NEUTRON OVS PLUGIN & AGENT WITH GRE FOR COMPUTE (node2)

5
resources/neutron_agents_ovs_puppet/actions/run.pp
View File

@ -30,4 +30,9 @@ class { 'neutron::agents::ovs':
polling_interval => $polling_interval, polling_interval => $polling_interval,
firewall_driver => $firewall_driver, firewall_driver => $firewall_driver,
veth_mtu => $veth_mtu, veth_mtu => $veth_mtu,
}
# Remove external class dependency
Service <| title == 'neutron-plugin-ovs-service' |> {
require => undef
} }

5
resources/neutron_plugins_ovs_puppet/actions/run.pp
View File

@ -33,4 +33,9 @@ include neutron::params
package { 'neutron': package { 'neutron':
ensure => $package_ensure, ensure => $package_ensure,
name => $::neutron::params::package_name, name => $::neutron::params::package_name,
}
# Remove external class dependency
Service <| title == 'neutron-plugin-ovs-service' |> {
require => undef
} }