bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
87 lines
3.1 KiB
Diff
87 lines
3.1 KiB
Diff
From d73f9ea44ec91944af0bc4faa743b0df2570f200 Mon Sep 17 00:00:00 2001
|
|
From: Al Bailey <Al.Bailey@windriver.com>
|
|
Date: Mon, 16 Oct 2017 13:12:14 -0500
|
|
Subject: [PATCH] Roll up TIS patches
|
|
|
|
Includes CGTS-6741 puppet openstack use internal url
|
|
---
|
|
lib/puppet/provider/openstack.rb | 1 +
|
|
lib/puppet/provider/openstack/auth.rb | 16 ++++++++++++++--
|
|
lib/puppet/provider/openstack/credentials.rb | 2 --
|
|
3 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
|
|
index 0240ce4..8b8e564 100644
|
|
--- a/lib/puppet/provider/openstack.rb
|
|
+++ b/lib/puppet/provider/openstack.rb
|
|
@@ -45,6 +45,7 @@ class Puppet::Provider::Openstack < Puppet::Provider
|
|
begin
|
|
action = args[1]
|
|
Timeout.timeout(command_timeout(action)) do
|
|
+ args.unshift('--os-interface', 'internal')
|
|
openstack_command *args
|
|
end
|
|
rescue Timeout::Error
|
|
diff --git a/lib/puppet/provider/openstack/auth.rb b/lib/puppet/provider/openstack/auth.rb
|
|
index 743071d..73abeb3 100644
|
|
--- a/lib/puppet/provider/openstack/auth.rb
|
|
+++ b/lib/puppet/provider/openstack/auth.rb
|
|
@@ -1,9 +1,19 @@
|
|
#require 'puppet/provider/openstack/credentials'
|
|
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/openstack/credentials')
|
|
+require 'hiera_puppet'
|
|
|
|
module Puppet::Provider::Openstack::Auth
|
|
|
|
- RCFILENAME = "#{ENV['HOME']}/openrc"
|
|
+ RCFILENAME = "/etc/nova/openrc"
|
|
+
|
|
+ def lookup_hiera(key)
|
|
+ HieraPuppet.lookup(key, :undef, self, nil, :priority)
|
|
+ end
|
|
+
|
|
+ def get_admin_password
|
|
+ value=lookup_hiera('keystone::admin_password')
|
|
+ return value
|
|
+ end
|
|
|
|
def get_os_vars_from_env
|
|
env = {}
|
|
@@ -17,7 +27,7 @@ module Puppet::Provider::Openstack::Auth
|
|
unless rcfile.nil?
|
|
File.open(rcfile).readlines.delete_if{|l| l=~ /^#|^$/ }.each do |line|
|
|
# we only care about the OS_ vars from the file LP#1699950
|
|
- if line =~ /OS_/
|
|
+ if line =~ /OS_/ and line.include?('=')
|
|
key, value = line.split('=')
|
|
key = key.split(' ').last
|
|
value = value.chomp.gsub(/'/, '')
|
|
@@ -38,6 +48,8 @@ module Puppet::Provider::Openstack::Auth
|
|
unless @credentials.set?
|
|
@credentials.unset
|
|
set_credentials(@credentials, get_os_vars_from_rcfile(rc_filename))
|
|
+ # retrieves the password from hiera data since keyring is not yet available
|
|
+ @credentials.password = get_admin_password
|
|
end
|
|
unless @credentials.set?
|
|
raise(Puppet::Error::OpenstackAuthInputError, 'Insufficient credentials to authenticate')
|
|
diff --git a/lib/puppet/provider/openstack/credentials.rb b/lib/puppet/provider/openstack/credentials.rb
|
|
index 2765b2b..9c831e3 100644
|
|
--- a/lib/puppet/provider/openstack/credentials.rb
|
|
+++ b/lib/puppet/provider/openstack/credentials.rb
|
|
@@ -70,11 +70,9 @@ class Puppet::Provider::Openstack::CredentialsV3 < Puppet::Provider::Openstack::
|
|
:domain_id,
|
|
:domain_name,
|
|
:key,
|
|
- :project_domain_id,
|
|
:project_domain_name,
|
|
:project_id,
|
|
:trust_id,
|
|
- :user_domain_id,
|
|
:user_domain_name,
|
|
:user_id
|
|
]
|
|
--
|
|
1.8.3.1
|
|
|