|
1 Upstream patch to move the definition of the :neutron command into the |
|
2 top-level provider. This patch will be in a future release of the |
|
3 module. |
|
4 |
|
5 Patch originates from: |
|
6 https://review.openstack.org/#/c/348007/ |
|
7 |
|
8 From 8a85bb0860e334bced12c86771e4ef23c6731dc2 Mon Sep 17 00:00:00 2001 |
|
9 From: Sofer Athlan-Guyot <[email protected]> |
|
10 Date: Wed, 27 Jul 2016 21:17:28 +0200 |
|
11 Subject: [PATCH] Put neutron provider commands in neutron.rb |
|
12 |
|
13 This allows to gain access to all neutron commands using composability, |
|
14 see[1] for an example. It removes some redundancy as well. Finally, it |
|
15 looks more like the openstacklib/**/openstack.rb provider code. |
|
16 |
|
17 [1] https://review.openstack.org/#/c/347468/ |
|
18 |
|
19 Change-Id: Iad0354f5babd86822e37053f3f7a1134803fd4f8 |
|
20 --- |
|
21 lib/puppet/provider/neutron.rb | 3 +++ |
|
22 lib/puppet/provider/neutron_network/neutron.rb | 2 -- |
|
23 lib/puppet/provider/neutron_port/neutron.rb | 2 -- |
|
24 lib/puppet/provider/neutron_router/neutron.rb | 2 -- |
|
25 lib/puppet/provider/neutron_router_interface/neutron.rb | 2 -- |
|
26 lib/puppet/provider/neutron_subnet/neutron.rb | 2 -- |
|
27 6 files changed, 3 insertions(+), 10 deletions(-) |
|
28 |
|
29 diff --git a/lib/puppet/provider/neutron.rb b/lib/puppet/provider/neutron.rb |
|
30 index b95b175..4b6cb18 100644 |
|
31 --- a/lib/puppet/provider/neutron.rb |
|
32 +++ b/lib/puppet/provider/neutron.rb |
|
33 @@ -3,6 +3,9 @@ require 'puppet/util/inifile' |
|
34 |
|
35 class Puppet::Provider::Neutron < Puppet::Provider |
|
36 |
|
37 + initvars |
|
38 + commands :neutron => 'neutron' |
|
39 + |
|
40 def self.conf_filename |
|
41 '/etc/neutron/neutron.conf' |
|
42 end |
|
43 diff --git a/lib/puppet/provider/neutron_network/neutron.rb b/lib/puppet/provider/neutron_network/neutron.rb |
|
44 index a0addd3..c2a78fa 100644 |
|
45 --- a/lib/puppet/provider/neutron_network/neutron.rb |
|
46 +++ b/lib/puppet/provider/neutron_network/neutron.rb |
|
47 @@ -11,8 +11,6 @@ Puppet::Type.type(:neutron_network).provide( |
|
48 Assumes that the neutron service is configured on the same host. |
|
49 EOT |
|
50 |
|
51 - commands :neutron => 'neutron' |
|
52 - |
|
53 mk_resource_methods |
|
54 |
|
55 def self.neutron_type |
|
56 diff --git a/lib/puppet/provider/neutron_port/neutron.rb b/lib/puppet/provider/neutron_port/neutron.rb |
|
57 index 5aae227..67b0a6d 100644 |
|
58 --- a/lib/puppet/provider/neutron_port/neutron.rb |
|
59 +++ b/lib/puppet/provider/neutron_port/neutron.rb |
|
60 @@ -12,8 +12,6 @@ Puppet::Type.type(:neutron_port).provide( |
|
61 EOT |
|
62 #TODO No security group support |
|
63 |
|
64 - commands :neutron => "neutron" |
|
65 - |
|
66 mk_resource_methods |
|
67 |
|
68 def self.instances |
|
69 diff --git a/lib/puppet/provider/neutron_router/neutron.rb b/lib/puppet/provider/neutron_router/neutron.rb |
|
70 index 0fc3e5c..074db97 100644 |
|
71 --- a/lib/puppet/provider/neutron_router/neutron.rb |
|
72 +++ b/lib/puppet/provider/neutron_router/neutron.rb |
|
73 @@ -11,8 +11,6 @@ Puppet::Type.type(:neutron_router).provide( |
|
74 Assumes that the neutron service is configured on the same host. |
|
75 EOT |
|
76 |
|
77 - commands :neutron => 'neutron' |
|
78 - |
|
79 mk_resource_methods |
|
80 |
|
81 def self.do_not_manage |
|
82 diff --git a/lib/puppet/provider/neutron_router_interface/neutron.rb b/lib/puppet/provider/neutron_router_interface/neutron.rb |
|
83 index e9b541a..cc3bb71 100644 |
|
84 --- a/lib/puppet/provider/neutron_router_interface/neutron.rb |
|
85 +++ b/lib/puppet/provider/neutron_router_interface/neutron.rb |
|
86 @@ -17,8 +17,6 @@ Puppet::Type.type(:neutron_router_interface).provide( |
|
87 |
|
88 EOT |
|
89 |
|
90 - commands :neutron => 'neutron' |
|
91 - |
|
92 mk_resource_methods |
|
93 |
|
94 def self.instances |
|
95 diff --git a/lib/puppet/provider/neutron_subnet/neutron.rb b/lib/puppet/provider/neutron_subnet/neutron.rb |
|
96 index 01f6371..b2daad8 100644 |
|
97 --- a/lib/puppet/provider/neutron_subnet/neutron.rb |
|
98 +++ b/lib/puppet/provider/neutron_subnet/neutron.rb |
|
99 @@ -12,8 +12,6 @@ Puppet::Type.type(:neutron_subnet).provide( |
|
100 Assumes that the neutron service is configured on the same host. |
|
101 EOT |
|
102 |
|
103 - commands :neutron => 'neutron' |
|
104 - |
|
105 mk_resource_methods |
|
106 |
|
107 def self.neutron_type |
|
108 -- |
|
109 1.9.1 |
|
110 |