Merge branch 'parsehocon-from-stdlib' into main

reidmv · reidmv · commit 1570c38e2c0f · 2021-03-21T18:22:04.000-07:00
diff --git a/lib/puppet/functions/peadm/parsehocon.rb b/lib/puppet/functions/peadm/parsehocon.rb
diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.20.0 < 7.0.0"
+      "version_requirement": ">= 6.5.0 < 7.0.0"
     },
     {
       "name": "WhatsARanjit/node_manager",
diff --git a/plans/upgrade.pp b/plans/upgrade.pp
@@ -167,7 +167,7 @@
 
       $pe_conf = ($current_pe_conf ? {
         undef   => {},
-        default => $current_pe_conf.peadm::parsehocon(),
+        default => $current_pe_conf.parsehocon(),
       } + {
         'console_admin_password'                => 'not used',
         'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`
`12`	`12`	`"name": "puppetlabs/stdlib",`
`13`		`- "version_requirement": ">= 4.20.0 < 7.0.0"`
	`13`	`+ "version_requirement": ">= 6.5.0 < 7.0.0"`
`14`	`14`	`},`
`15`	`15`	`{`
`16`	`16`	`"name": "WhatsARanjit/node_manager",`