x/solar
Code Issues Proposed changes

Fix ml2 agent resource and compostion

Browse Source 
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-08-31 11:16:55 +02:00
parent 2c1855230c
commit 23899f0167
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example-puppet.py
View File

@ -238,7 +238,7 @@ def setup_resources():
# NEUTRON ML2 PLUGIN & ML2-OVS AGENT WITH GRE
neutron_plugins_ml2 = vr.create('neutron_plugins_ml2', 'resources/neutron_plugins_ml2_puppet', {})[0]
signals.connect(node1, neutron_plugins_ml2)
neutron_agents_ml2 = vr.create('neutron_agents_ml2_ovs', 'resources/neutron_agents_ml2_ovs_puppet', {
neutron_agents_ml2 = vr.create('neutron_agents_ml2', 'resources/neutron_agents_ml2_ovs_puppet', {
# TODO(bogdando) these should come from the node network resource
'enable_tunneling': True,
'tunnel_types': ['gre'],

2
resources/neutron_agents_ml2_ovs_puppet/actions/run.pp
View File

@ -41,5 +41,5 @@ Service <| title == 'neutron-ovs-agent-service' |> {
require => undef
}
Neutron_plugin_ml2<||> ~> Service['neutron-ovs-agent-service']
File['/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini'] ~>
File <| title == '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini' |> ~>
Service<| title == 'neutron-ovs-agent-service' |>