Skip to content

Commit 914eaf9

Browse files
authored
Merge pull request #13 from WhatsARanjit/description
Description
2 parents 27efd65 + 26dec43 commit 914eaf9

File tree

7 files changed

+30
-12
lines changed

7 files changed

+30
-12
lines changed

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313

1414
## Overview
1515

16-
Create and manage Node Manager API endpoints as resources.
17-
18-
## Module State
19-
20-
NOTE: This module is a Professional Service side project and is currently unmaintained.
21-
It is not supported and may not function as expected.
16+
Create and manage PE node groups as resources.
2217

2318
## Requirements
2419

@@ -61,6 +56,10 @@ node_group { 'PE MCollective':
6156

6257
#### Node_group parameters
6358

59+
* `description`
60+
61+
Description of the node_group.
62+
6463
* `classes`
6564

6665
Classes that are assigned to the node in hash format. Elements of the hash are class parameters.
@@ -181,4 +180,3 @@ This repositority is largely the work of some Puppet community members.
181180
It is not officially maintained by Puppet, or any individual in
182181
particular. Issues should be opened in Github. Questions should be directed
183182
at the individuals responsible for committing that particular code.
184-

lib/puppet/provider/node_group/https.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ def self.friendly_name
3030
:name => 'name',
3131
:parent => 'parent',
3232
:rule => 'rule',
33-
:variables => 'variables'
33+
:variables => 'variables',
34+
:description => 'description',
3435
}
3536
end
3637

lib/puppet/provider/node_group/puppetclassify.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ def self.friendly_name
3131
:name => 'name',
3232
:parent => 'parent',
3333
:rule => 'rule',
34-
:variables => 'variables'
34+
:variables => 'variables',
35+
:description => 'description',
3536
}
3637
end
3738

3839
def self.instances
39-
deprecation_warning('This provider is being deprecated. See https provider at https://github.com/WhatsARanjit/prosvcs-node_manager/blob/https_provider/HTTPS.md')
4040
$ngs = classifier.groups.get_groups
4141
$ngs.collect do |group|
4242
ngs_hash = {}
@@ -57,6 +57,7 @@ def self.instances
5757
end
5858

5959
def self.prefetch(resources)
60+
deprecation_warning('This provider is being deprecated. See https provider at https://github.com/WhatsARanjit/prosvcs-node_manager/blob/https_provider/HTTPS.md')
6061
ngs = instances
6162
resources.keys.each do |group|
6263
if provider = ngs.find{ |g| g.name == group }

lib/puppet/type/node_group.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
fail("Classes must be supplied as a hash") unless value.is_a?(Hash)
4141
end
4242
end
43+
newproperty(:description) do
44+
desc 'Description of this group'
45+
end
4346

4447
autorequire(:node_group) do
4548
self[:parent] if @parameters.include? :parent

spec/integration/puppet/provider/node_group/https_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
".*"
2121
]
2222
],
23-
"variables": {}
23+
"variables": {},
24+
"description": "Sample message"
2425
}
2526
]
2627
EOS
@@ -35,6 +36,7 @@
3536
"stubkey" => "stubvalue",
3637
"stubkey2" => "stubvalue2"
3738
},
39+
"description" => "Sample message",
3840
"name" => "stub_name",
3941
}.to_json
4042

@@ -51,6 +53,7 @@
5153
:stubkey => :stubvalue,
5254
:stubkey2 => :stubvalue2,
5355
},
56+
:description => "Sample message",
5457
)
5558
end
5659

spec/integration/puppet/provider/node_group/puppetclassify_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
".*"
2121
]
2222
],
23-
"variables": {}
23+
"variables": {},
24+
"description": "Sample message"
2425
}
2526
]
2627
EOS
@@ -36,6 +37,7 @@
3637
"stubkey" => "stubvalue",
3738
"stubkey2" => "stubvalue2"
3839
},
40+
"description" => "Sample message",
3941
"name" => "stub_name",
4042
}.to_json
4143

@@ -52,6 +54,7 @@
5254
:stubkey => :stubvalue,
5355
:stubkey2 => :stubvalue2,
5456
},
57+
:description => "Sample message",
5558
)
5659
end
5760

spec/unit/puppet/type/node_group_spec.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,13 @@
6464
}.to_not raise_error
6565
end
6666

67+
it "should accept a description parameter" do
68+
expect {
69+
Puppet::Type.type(:node_group).new(
70+
:name => 'stubname',
71+
:description => 'Sample message',
72+
)
73+
}.to_not raise_error
74+
end
75+
6776
end

0 commit comments

Comments
 (0)