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>
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From ce72dedc948691a25848829798c8a4afd1a380d0 Mon Sep 17 00:00:00 2001
|
|
From: Al Bailey <Al.Bailey@windriver.com>
|
|
Date: Tue, 14 Nov 2017 09:48:56 -0600
|
|
Subject: [PATCH] Roll up WRS patches to pike
|
|
|
|
---
|
|
manifests/db/sync.pp | 3 +++
|
|
manifests/expirer.pp | 2 +-
|
|
manifests/params.pp | 4 ++--
|
|
3 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
|
|
index db08f6d..7c9ab55 100644
|
|
--- a/manifests/db/sync.pp
|
|
+++ b/manifests/db/sync.pp
|
|
@@ -29,6 +29,9 @@ class ceilometer::db::sync(
|
|
Anchor['ceilometer::config::end'],
|
|
Anchor['ceilometer::dbsync::begin']
|
|
],
|
|
+ # Only do the db sync if both controllers are running the same software
|
|
+ # version. Avoids impacting mate controller during an upgrade.
|
|
+ onlyif => "test $::controller_sw_versions_match = true",
|
|
notify => Anchor['ceilometer::dbsync::end'],
|
|
}
|
|
|
|
diff --git a/manifests/expirer.pp b/manifests/expirer.pp
|
|
index b69db8a..66847c5 100644
|
|
--- a/manifests/expirer.pp
|
|
+++ b/manifests/expirer.pp
|
|
@@ -65,7 +65,7 @@ class ceilometer::expirer (
|
|
ensure => $ensure,
|
|
command => $ceilometer::params::expirer_command,
|
|
environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
|
- user => 'ceilometer',
|
|
+ user => 'root',
|
|
minute => $minute,
|
|
hour => $hour,
|
|
monthday => $monthday,
|
|
diff --git a/manifests/params.pp b/manifests/params.pp
|
|
index 4550dbd..456d8f9 100644
|
|
--- a/manifests/params.pp
|
|
+++ b/manifests/params.pp
|
|
@@ -7,7 +7,7 @@ class ceilometer::params {
|
|
include ::openstacklib::defaults
|
|
|
|
$dbsync_command = 'ceilometer-upgrade'
|
|
- $expirer_command = 'ceilometer-expirer'
|
|
+ $expirer_command = '/usr/bin/ceilometer-expirer-active'
|
|
$user = 'ceilometer'
|
|
$event_pipeline = '/etc/ceilometer/event_pipeline.yaml'
|
|
$pipeline = '/etc/ceilometer/pipeline.yaml'
|
|
@@ -33,7 +33,7 @@ class ceilometer::params {
|
|
$agent_notification_service_name = 'openstack-ceilometer-notification'
|
|
$ceilometer_wsgi_script_path = '/var/www/cgi-bin/ceilometer'
|
|
$ceilometer_wsgi_script_source = '/usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi'
|
|
- $libvirt_group = undef
|
|
+ $libvirt_group = 'libvirt'
|
|
}
|
|
'Debian': {
|
|
# package names
|
|
--
|
|
1.8.3.1
|
|
|