Update refs and move defaults to init.pp

voxpupuli · Nov 27, 2023 · 7aa22fa · 7aa22fa
1 parent e0cc8ae
commit 7aa22fa
Show file tree

Hide file tree

Showing 14 changed files with 560 additions and 684 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
diff --git a/data/os/Debian.yaml → data/Debian.yaml b/data/os/Debian.yaml → data/Debian.yaml
diff --git a/data/os/RedHat.yaml → data/RedHat.yaml b/data/os/RedHat.yaml → data/RedHat.yaml
diff --git a/data/common.yaml b/data/common.yaml
diff --git a/hiera.yaml b/hiera.yaml
@@ -7,7 +7,4 @@ defaults:
 
 hierarchy:
   - name: 'Rundeck Operating System Family defaults'
-    path: 'os/%{facts.os.family}.yaml'
-
-  - name: 'Rundeck common defaults'
-    path: 'common.yaml'
+    path: '%{facts.os.family}.yaml'
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -5,7 +5,7 @@
 class rundeck::config {
   assert_private()
 
-  $framework_config = deep_merge(lookup('rundeck::framework_config'), $rundeck::framework_config)
+  $framework_config = deep_merge($rundeck::framework_config)
 
   $base_dir       = $framework_config['rdeck.base']
   $properties_dir = $framework_config['framework.etc.dir']

diff --git a/manifests/config/aclpolicyfile.pp b/manifests/config/aclpolicyfile.pp
@@ -4,38 +4,26 @@
 #   rundeck::config::aclpolicyfile { 'myPolicyFile':
 #     acl_policies => [
 #       {
-#         'description'    => 'Admin, all access',
-#         'context'        => {
-#           'type' => 'project',
-#           'rule' => '.*',
+#         'description' => 'Admin, all access',
+#         'context'     => { 'project' => '.*' },
+#         'for'         => {
+#           'resource' => [{ 'allow' => '*' }],
+#           'adhoc'    => [{ 'allow' => '*' }],
+#           'job'      => [{ 'allow' => '*' }],
+#           'node'     => [{ 'allow' => '*' }],
 #         },
-#         'resource_types' => [
-#           { 'type'  => 'resource', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#           { 'type'  => 'adhoc', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#           { 'type'  => 'job', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#           { 'type'  => 'node', 'rules' => [{ 'name' => 'allow','rule' => '*' }] }
-#         ],
-#         'by'             => {
-#           'group'    => ['admin'],
-#           'username' => undef,
-#         }
+#         'by'          => [{ 'group' => ['admin'] }],
 #       },
 #       {
-#         'description'    => 'Admin, all access',
-#         'context'        => {
-#           'type' => 'application',
-#           'rule' => 'rundeck',
+#         'description' => 'Admin, all access',
+#         'context'     => { 'application' => 'rundeck' },
+#         'for'         => {
+#           'project'     => [{ 'allow' => '*' }],
+#           'resource'    => [{ 'allow' => '*' }],
+#           'storage'     => [{ 'allow' => '*' }],
 #         },
-#         'resource_types' => [
-#           { 'type'  => 'resource', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#           { 'type'  => 'project', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#           { 'type'  => 'storage', 'rules' => [{ 'name' => 'allow','rule' => '*' }] },
-#         ],
-#         'by'             => {
-#           'group'    => ['admin'],
-#           'username' => undef,
-#         }
-#       }
+#         'by'          => [{ 'group' => ['admin'] }],
+#       },
 #     ],
 #   }
 #

diff --git a/manifests/config/framework.pp b/manifests/config/framework.pp
@@ -14,9 +14,7 @@
     $_framework_ssl_config = {}
   }
 
-  $_server_uuid = { 'rundeck.server.uuid' => fqdn_uuid($facts['networking']['fqdn']) }
-
-  $_framework_config = deep_merge($rundeck::config::framework_config, $_server_uuid, $_framework_ssl_config)
+  $_framework_config = deep_merge($rundeck::config::framework_config, $_framework_ssl_config)
 
   file { "${rundeck::config::properties_dir}/framework.properties":
     ensure  => file,