Changed class creation behavior

tedivm · Apr 2, 2015 · 7b3f897 · 7b3f897
1 parent e011ddc
commit 7b3f897
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
-##2015-03-29 - Release 0.6.0
+## 2015-04-01 - Release 0.6.1
+
+### Summary
+
+This release changes the way classes are created to work around "defined"
+issues.
+
+
+## 2015-03-29 - Release 0.6.0
 
 ### Summary
 
@@ -26,7 +34,7 @@
 
 
 
-##2015-03-22 - Release 0.5.2
+## 2015-03-22 - Release 0.5.2
 
 ### Summary
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -56,6 +56,10 @@
   $firewall_post_label = 'firewall_post',
   $firewall_post_enabled = false,
   $firewall_post_defaults = {},
+  $class_label =
+    'class',
+  $class_defaults = {},
+  $class_enabled = false,
   $acl_label =
     'acl',
   $acl_defaults = {},
@@ -120,10 +124,6 @@
     'augeas',
   $augeas_defaults = {},
   $augeas_enabled = false,
-  $class_label =
-    'class',
-  $class_defaults = {},
-  $class_enabled = false,
   $computers_label =
     'computers',
   $computers_defaults = {},
@@ -630,18 +630,6 @@
           $augeas_config)
   }
 
-  if(defined('class')
-    and ($class_enabled
-      or $global_enable)) {
-
-        $class_config =
-          hiera_hash("${prefix}${class_label}",
-            $class_defaults)
-
-        create_resources('class',
-          $class_config)
-  }
-
   if(defined('computers')
     and ($computers_enabled
       or $global_enable)) {
@@ -1580,6 +1568,15 @@
 
 
 
+  if($class_enabled or $global_enable) {
+    $class_config =
+      hiera_hash("${prefix}${class_label}",
+        $class_defaults)
+
+    create_resources('class',
+      $class_config)
+  }
+
   class { 'hieratic::firewall':
     global_enable          => $global_enable,
     firewall_label         => "${prefix}${firewall_label}",

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "tedivm-hieratic",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "author": "tedivm",
     "summary": "Hieratic allows Puppet Resources to be created directly in Hiera.",
     "license": "MIT",

diff --git a/resources/typelist.txt b/resources/typelist.txt
@@ -1,5 +1,4 @@
 augeas
-class
 computers
 cron
 exec

diff --git a/src/generate.py b/src/generate.py
@@ -36,6 +36,10 @@
   $firewall_post_label = 'firewall_post',
   $firewall_post_enabled = false,
   $firewall_post_defaults = {},
+  $class_label =
+    'class',
+  $class_defaults = {},
+  $class_enabled = false,
 """
 
 for puppet_type in puppet_types:
@@ -48,6 +52,15 @@
 
 hieratic_class += """
 
+  if($class_enabled or $global_enable) {
+    $class_config =
+      hiera_hash("${prefix}${class_label}",
+        $class_defaults)
+
+    create_resources('class',
+      $class_config)
+  }
+
   class { 'hieratic::firewall':
     global_enable          => $global_enable,
     firewall_label         => "${prefix}${firewall_label}",
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     augeas
-    class
     computers
     cron
     exec
@@ Expand Down @@