0235b45982
The HieraPuppet.lookup() function malfunctions when hiera v5 is used. In order to have Hiera v5 working, the function was replaced by the 'puppet lookup' command. Hiera v5 should be used instead of Hiera v3 to avoid the following warning during bootstrap: "/etc/puppet/hiera.yaml: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5" Also replaced the default path in which keystone.rb looks for openstacklib since a custom installation directory is being used. Debian Bullseye tests: PASS: Build & install PASS: Successful Bootstrap Story: 2009964 Task: 45008 Signed-off-by: Matheus Machado Guilhermino <Matheus.MachadoGuilhermino@windriver.com> Change-Id: I570aa6e06448e00b96882629b54882a1467740c5
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 864ce60461737423b4487390dd232caecbba4985 Mon Sep 17 00:00:00 2001
|
|
From: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
|
|
Date: Thu, 21 Apr 2022 20:16:47 +0000
|
|
Subject: [PATCH] Replace deprecated hiera function
|
|
|
|
Replaced the deprecated 'HieraPuppet.lookup()' function with the
|
|
'puppet lookup' command.
|
|
|
|
Signed-off-by: Matheus Machado Guilhermino <matheus.machadoguilhermino@windriver.com>
|
|
---
|
|
lib/puppet/provider/openstack/auth.rb | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/puppet/provider/openstack/auth.rb b/lib/puppet/provider/openstack/auth.rb
|
|
index 4026aec..99a8733 100644
|
|
--- a/lib/puppet/provider/openstack/auth.rb
|
|
+++ b/lib/puppet/provider/openstack/auth.rb
|
|
@@ -1,13 +1,12 @@
|
|
#require 'puppet/provider/openstack/credentials'
|
|
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/openstack/credentials')
|
|
-require 'hiera_puppet'
|
|
|
|
module Puppet::Provider::Openstack::Auth
|
|
|
|
RCFILENAME = "/etc/platform/openrc"
|
|
|
|
def lookup_hiera(key)
|
|
- HieraPuppet.lookup(key, :undef, self, nil, :priority)
|
|
+ %(sudo puppet lookup #{key})[4...-1]
|
|
end
|
|
|
|
def get_admin_password
|
|
--
|
|
2.30.2
|
|
|