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>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 17142ba33ae9cdf10bcc36a1329e97a5dfd7d7d6 Mon Sep 17 00:00:00 2001
|
|
From: Tao Liu <tao.liu@windriver.com>
|
|
Date: Wed, 21 Feb 2018 13:35:59 -0600
|
|
Subject: [PATCH 1/1] Add os region name option for system controller
|
|
|
|
---
|
|
lib/puppet/provider/openstack.rb | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
|
|
index 8b8e564..53f2366 100644
|
|
--- a/lib/puppet/provider/openstack.rb
|
|
+++ b/lib/puppet/provider/openstack.rb
|
|
@@ -40,12 +40,23 @@ class Puppet::Provider::Openstack < Puppet::Provider
|
|
self.class_variable_get("@@command_timeout")
|
|
end
|
|
|
|
+ def self.hiera_lookup(key)
|
|
+ HieraPuppet.lookup(key, :undef, self, nil, :priority)
|
|
+ end
|
|
+
|
|
+ def self.systemcontroller?
|
|
+ return true if hiera_lookup('platform::params::distributed_cloud_role') == 'systemcontroller'
|
|
+ end
|
|
+
|
|
# with command_timeout
|
|
def self.openstack(*args)
|
|
begin
|
|
action = args[1]
|
|
Timeout.timeout(command_timeout(action)) do
|
|
args.unshift('--os-interface', 'internal')
|
|
+ if systemcontroller?
|
|
+ args.unshift('--os-region-name', 'SystemController')
|
|
+ end
|
|
openstack_command *args
|
|
end
|
|
rescue Timeout::Error
|
|
--
|
|
1.8.3.1
|
|
|