Update hiera to v5 + fix warning Unknown variable: '::orawls::weblogi…

…c::wls_apps_dir'
biemond · Aug 2, 2019 · 1e89f63 · 1e89f63
1 parent 0bdc10b
commit 1e89f63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/hiera.yaml b/hiera.yaml
@@ -1,10 +1,13 @@
 ---
-version: 4
-datadir: data
+version: 5
+
+defaults:
+  datadir: data
+  data_hash: yaml_data
+
 hierarchy:
   - name: "kernel"
-    backend: yaml
-    path: "kernel/%{facts.kernel}"
-
+    path: "kernel/%{facts.kernel}.yaml"
+
   - name: "common"
-    backend: yaml
+    path: "common.yaml"
diff --git a/manifests/domain.pp b/manifests/domain.pp
@@ -105,7 +105,7 @@
   String $middleware_home_dir                             = $::orawls::weblogic::middleware_home_dir,
   String $jdk_home_dir                                    = $::orawls::weblogic::jdk_home_dir,
   Optional[String] $wls_domains_dir                       = $::orawls::weblogic::wls_domains_dir,
-  Optional[String] $wls_apps_dir                          = $::orawls::weblogic::wls_apps_dir,
+  Optional[String] $wls_apps_dir                          = undef,
   String $domain_template                                 = 'standard', # adf|adf_restricted|forms|osb|osb_soa_bpm|osb_soa|soa|soa_bpm|bam|wc|wcs|wc_wcc_bpm|oud|ohs_standalone
   Boolean $bam_enabled                                    = true,  #only for SOA Suite
   Boolean $b2b_enabled                                    = false, #only for SOA Suite 12.1.3 with b2b

diff --git a/metadata.json b/metadata.json
@@ -29,7 +29,6 @@
       "version_requirement": ">=4.9.0"
     }
   ],
-  "data_provider": "hiera",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",