From 23899f01675a3d74b4174b0fcf60eb9d4e463da7 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Mon, 31 Aug 2015 11:16:55 +0200 Subject: [PATCH] Fix ml2 agent resource and compostion Signed-off-by: Bogdan Dobrelya --- example-puppet.py | 2 +- resources/neutron_agents_ml2_ovs_puppet/actions/run.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example-puppet.py b/example-puppet.py index 8a141b27..3a9f326c 100644 --- a/example-puppet.py +++ b/example-puppet.py @@ -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'], diff --git a/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp b/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp index 20e38134..f9941be7 100644 --- a/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp +++ b/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp @@ -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' |> \ No newline at end of file