[openstack-puppet-modules/f21] Updated to 2014.1-25
Martin Mágr
mmagr at fedoraproject.org
Fri Oct 24 09:44:05 UTC 2014
commit 2408e23011ac875752e3781c529f0839ed62baa0
Author: Martin Mágr <mmagr at redhat.com>
Date: Fri Oct 24 11:43:47 2014 +0200
Updated to 2014.1-25
...e-the-nova-uid-gid-if-nova_-user-group-_i.patch | 192 +++++
0001-Fix-neutron-subnets-with-empty-values.patch | 91 ---
0001-Fixed-ovs-provider.patch | 259 -------
0001-Fixes-agent_notification_service_name.patch | 32 -
0001-Fixes-bridge-interface-name-check.patch | 27 -
...-remove-duplication-with-ceilometer-agent.patch | 36 -
...fored-a-more-suitable-ovs_redhat-provider.patch | 451 ------------
0001-Refresh-Neutron-server.patch | 47 --
...Remove-ability-to-manage-the-nova-uid-gid.patch | 192 -----
...fored-a-more-suitable-ovs_redhat-provider.patch | 374 ----------
...dge-addition-error-if-interface-has-no-IP.patch | 30 -
apache24.patch | 80 ---
keystone.patch | 26 -
manage_service-ceilometer.patch | 735 +++++++++++++++++++-
mariadb.patch | 55 --
neutron.patch | 13 -
openstack-puppet-modules.spec | 106 ++--
puppetlabs-firewall-pull-request-367.patch | 37 -
sources | 20 +-
swift-restorecon.patch | 75 --
20 files changed, 949 insertions(+), 1929 deletions(-)
---
diff --git a/0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch b/0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch
new file mode 100644
index 0000000..487f0f7
--- /dev/null
+++ b/0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch
@@ -0,0 +1,192 @@
+From 886670be58d2b05c90919c4ff255f8b1bc7b8d20 Mon Sep 17 00:00:00 2001
+From: Lukas Bezdicka <lbezdick at redhat.com>
+Date: Thu, 3 Jul 2014 15:37:59 +0200
+Subject: [PATCH] Don't manage the nova uid/gid if nova_{user,group}_id is
+ undef
+
+Any user modification before standard system package creates the
+user is wrong. Usecase of patch adding the user is also broken as
+there are several other options: provide user before whole class
+nova, have user id enforced by package or as most humans do accept
+that in multi host enviroments there are 3 layers - user, group and
+netgroup. In all cases nova puppet module should never touch the
+user as it's provided by package on all supported systems, but for
+backwards compatibility the management of user is disabled if
+nova_group_id is undef or if nova_user_id is undef.
+
+Closes-Bug: rhbz#1115946
+(cherry picked from commit d850c3ceb4d2101078a75385d52c69b3a352776b)
+Change-Id: If22b27f5fb78ba6821f4d6e8c275f8b80c70dd59
+---
+ manifests/compute/libvirt.pp | 2 +-
+ manifests/consoleauth.pp | 2 +-
+ manifests/init.pp | 51 +++++++++++++++++++++++++++---------------
+ manifests/objectstore.pp | 2 +-
+ spec/classes/nova_init_spec.rb | 11 ++++-----
+ 5 files changed, 42 insertions(+), 26 deletions(-)
+
+diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
+index fe6ea33..a0a1712 100644
+--- a/manifests/compute/libvirt.pp
++++ b/manifests/compute/libvirt.pp
+@@ -105,7 +105,7 @@ class nova::compute::libvirt (
+ package { "nova-compute-${libvirt_virt_type_real}":
+ ensure => present,
+ before => Package['nova-compute'],
+- require => User['nova'],
++ require => Package['nova-common'],
+ }
+ }
+
+diff --git a/manifests/consoleauth.pp b/manifests/consoleauth.pp
+index 953e712..4813b36 100644
+--- a/manifests/consoleauth.pp
++++ b/manifests/consoleauth.pp
+@@ -33,7 +33,7 @@ class nova::consoleauth(
+ package_name => $::nova::params::consoleauth_package_name,
+ service_name => $::nova::params::consoleauth_service_name,
+ ensure_package => $ensure_package,
+- require => User['nova'],
++ require => Package['nova-common'],
+ }
+
+ }
+diff --git a/manifests/init.pp b/manifests/init.pp
+index 3202db0..3e9ecd1 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -200,14 +200,22 @@
+ # (optional) Create the nova user with the specified gid.
+ # Changing to a new uid after specifying a different uid previously,
+ # or using this option after the nova account already exists will break
+-# the ownership of all files/dirs owned by nova.
++# the ownership of all files/dirs owned by nova. It is strongly encouraged
++# not to use this option and instead create user before nova class or
++# for network shares create netgroup into which you'll put nova on all the
++# nodes. If undef no user will be created and user creation will standardly
++# happen in nova-common package.
+ # Defaults to undef.
+ #
+ # [*nova_group_id*]
+ # (optional) Create the nova user with the specified gid.
+ # Changing to a new uid after specifying a different uid previously,
+ # or using this option after the nova account already exists will break
+-# the ownership of all files/dirs owned by nova.
++# the ownership of all files/dirs owned by nova. It is strongly encouraged
++# not to use this option and instead create group before nova class or for
++# network shares create netgroup into which you'll put nova on all the
++# nodes. If undef no user or group will be created and creation will
++# happen in nova-common package.
+ # Defaults to undef.
+ #
+ # [*nova_public_key*]
+@@ -339,22 +347,29 @@ class nova(
+ }
+ }
+
+- group { 'nova':
+- ensure => present,
+- system => true,
+- gid => $nova_group_id,
+- before => User['nova'],
++ if $nova_group_id {
++ warning('The nova_group_id will be deprecated, please create group manually')
++ group { 'nova':
++ ensure => present,
++ system => true,
++ gid => $nova_group_id,
++ before => Package['nova-common'],
++ }
+ }
+-
+- user { 'nova':
+- ensure => present,
+- system => true,
+- groups => 'nova',
+- home => '/var/lib/nova',
+- managehome => false,
+- shell => $nova_shell,
+- uid => $nova_user_id,
+- gid => $nova_group_id,
++ if $nova_user_id {
++ warning('The nova_user_id will be deprecated, please create user manually')
++ user { 'nova':
++ ensure => present,
++ system => true,
++ groups => 'nova',
++ home => '/var/lib/nova',
++ managehome => false,
++ shell => $nova_shell,
++ uid => $nova_user_id,
++ gid => $nova_group_id,
++ before => Package['nova-common'],
++ require => Group['nova'],
++ }
+ }
+
+ if $nova_public_key or $nova_private_key {
+@@ -445,7 +460,7 @@ class nova(
+ package { 'nova-common':
+ ensure => $ensure_package,
+ name => $::nova::params::common_package_name,
+- require => [Package['python-nova'], Anchor['nova-start'], User['nova']]
++ require => [Package['python-nova'], Anchor['nova-start']]
+ }
+
+ file { '/etc/nova/nova.conf':
+diff --git a/manifests/objectstore.pp b/manifests/objectstore.pp
+index d8b6359..466be81 100644
+--- a/manifests/objectstore.pp
++++ b/manifests/objectstore.pp
+@@ -35,7 +35,7 @@ class nova::objectstore(
+ package_name => $::nova::params::objectstore_package_name,
+ service_name => $::nova::params::objectstore_service_name,
+ ensure_package => $ensure_package,
+- require => User['nova'],
++ require => Package['nova-common'],
+ }
+
+ nova_config {
+diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
+index c66b04b..9729d00 100644
+--- a/spec/classes/nova_init_spec.rb
++++ b/spec/classes/nova_init_spec.rb
+@@ -22,13 +22,13 @@ describe 'nova' do
+ )
+ end
+
+- it 'creates user and group' do
+- should contain_group('nova').with(
++ it 'does not create user and group' do
++ should_not contain_group('nova').with(
+ :ensure => 'present',
+ :system => true,
+ :before => 'User[nova]'
+ )
+- should contain_user('nova').with(
++ should_not contain_user('nova').with(
+ :ensure => 'present',
+ :system => true,
+ :groups => 'nova',
+@@ -141,7 +141,7 @@ describe 'nova' do
+ :ensure => 'present',
+ :system => true,
+ :gid => '499',
+- :before => 'User[nova]'
++ :before => 'Package[nova-common]'
+ )
+ should contain_user('nova').with(
+ :ensure => 'present',
+@@ -151,7 +151,8 @@ describe 'nova' do
+ :managehome => false,
+ :shell => '/bin/bash',
+ :uid => '499',
+- :gid => '499'
++ :gid => '499',
++ :require => 'Group[nova]'
+ )
+ end
+
+--
+1.9.3
+
diff --git a/manage_service-ceilometer.patch b/manage_service-ceilometer.patch
index 673f900..821710e 100644
--- a/manage_service-ceilometer.patch
+++ b/manage_service-ceilometer.patch
@@ -1,4 +1,4 @@
-From 26fd14602be2687db9b7cb236d1014bbfefe9d16 Mon Sep 17 00:00:00 2001
+From 181f263e5cd7d3e944093c9c51c35b08f7822a14 Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr at redhat.com>
Date: Wed, 20 Aug 2014 15:57:55 +0200
Subject: [PATCH] Add manage_service feature
@@ -8,25 +8,38 @@ $manage_service parameter to all relevant classes.
Closes-bug: #1359823
Change-Id: Iee545b46ef5d7cf92859356ae84b8103564bf047
-
-Conflicts:
- manifests/collector.pp
---
- manifests/agent/central.pp | 13 ++++++++-----
- manifests/agent/compute.pp | 13 ++++++++-----
- manifests/agent/notification.pp | 11 +++++++----
- manifests/alarm/evaluator.pp | 13 ++++++++-----
- manifests/alarm/notifier.pp | 11 +++++++----
- manifests/api.pp | 11 +++++++----
- manifests/collector.pp | 13 ++++++++-----
- 7 files changed, 53 insertions(+), 32 deletions(-)
+ manifests/agent/central.pp | 20 +++++---
+ manifests/agent/compute.pp | 21 +++++---
+ manifests/agent/notification.pp | 20 +++++---
+ manifests/alarm/evaluator.pp | 36 ++++++++++----
+ manifests/alarm/notifier.pp | 35 +++++++++----
+ manifests/api.pp | 57 ++++++++++++++--------
+ manifests/collector.pp | 24 ++++++---
+ spec/classes/ceilometer_agent_central_spec.rb | 45 +++++++++++++----
+ spec/classes/ceilometer_agent_compute_spec.rb | 50 ++++++++++++++-----
+ spec/classes/ceilometer_agent_notification_spec.rb | 50 ++++++++++++++-----
+ spec/classes/ceilometer_alarm_evaluator_spec.rb | 56 +++++++++++++++------
+ spec/classes/ceilometer_alarm_notifier_spec.rb | 48 +++++++++++++-----
+ spec/classes/ceilometer_api_spec.rb | 51 ++++++++++++++-----
+ spec/classes/ceilometer_collector_spec.rb | 27 ++++++++++
+ 14 files changed, 402 insertions(+), 138 deletions(-)
diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
-index 0a07856..4f7aee2 100644
+index 0a07856..7c17d8c 100644
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
-@@ -5,7 +5,8 @@
- # Should the service be enabled. Optional. Defauls to true
+@@ -2,10 +2,16 @@
+ #
+ # == Parameters
+ # [*enabled*]
+-# Should the service be enabled. Optional. Defauls to true
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
#
class ceilometer::agent::central (
- $enabled = true,
@@ -35,7 +48,7 @@ index 0a07856..4f7aee2 100644
) {
include ceilometer::params
-@@ -18,10 +19,12 @@ class ceilometer::agent::central (
+@@ -18,10 +24,12 @@ class ceilometer::agent::central (
name => $::ceilometer::params::agent_central_package_name,
}
@@ -53,11 +66,21 @@ index 0a07856..4f7aee2 100644
Package['ceilometer-common'] -> Service['ceilometer-agent-central']
diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
-index fde3705..df9cc8d 100644
+index fde3705..9a81e8c 100644
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
-@@ -7,7 +7,8 @@
- # Optional. Defaults to true
+@@ -3,11 +3,16 @@
+ #
+ # == Parameters
+ # [*enabled*]
+-# should the service be started or not
+-# Optional. Defaults to true
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
#
class ceilometer::agent::compute (
- $enabled = true,
@@ -66,7 +89,7 @@ index fde3705..df9cc8d 100644
) inherits ceilometer {
include ceilometer::params
-@@ -30,10 +31,12 @@ class ceilometer::agent::compute (
+@@ -30,10 +35,12 @@ class ceilometer::agent::compute (
}
}
@@ -84,10 +107,27 @@ index fde3705..df9cc8d 100644
Package['ceilometer-common'] -> Service['ceilometer-agent-compute']
diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
-index 2999362..fe1765d 100644
+index 2999362..f8c2631 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
-@@ -38,6 +38,7 @@
+@@ -23,10 +23,13 @@
+ # file with the OVS plugin if both are on the same machine.
+ #
+ # === Parameters
+-#
+ # [*enabled*]
+-# (optional) Should the service be started or not
+-# Defaults to true
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
+ #
+ # [*ack_on_event_error*]
+ # (optional) Acknowledge message when event persistence fails.
+@@ -38,6 +41,7 @@
#
class ceilometer::agent::notification (
@@ -95,7 +135,7 @@ index 2999362..fe1765d 100644
$enabled = true,
$ack_on_event_error = true,
$store_events = false
-@@ -50,10 +51,12 @@ class ceilometer::agent::notification (
+@@ -50,10 +54,12 @@ class ceilometer::agent::notification (
Package[$::ceilometer::params::agent_notification_package_name] -> Service['ceilometer-agent-notification']
ensure_packages([$::ceilometer::params::agent_notification_package_name])
@@ -113,11 +153,40 @@ index 2999362..fe1765d 100644
Package['ceilometer-common'] -> Service['ceilometer-agent-notification']
diff --git a/manifests/alarm/evaluator.pp b/manifests/alarm/evaluator.pp
-index 2621534..7b2366e 100644
+index 2621534..2b9ca64 100644
--- a/manifests/alarm/evaluator.pp
+++ b/manifests/alarm/evaluator.pp
-@@ -13,7 +13,8 @@
- # Record alarm change events
+@@ -2,18 +2,32 @@
+ #
+ # == Params
+ # [*enabled*]
+-# should the service be enabled
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
++#
+ # [*evaluation_interval*]
+-# define the time interval for the alarm evaluator
++# (optional) Define the time interval for the alarm evaluator
++# Defaults to 60.
++#
+ # [*evaluation_service*]
+-# define which service use for the evaluator
++# (optional) Define which service use for the evaluator
++# Defaults to 'ceilometer.alarm.service.SingletonAlarmService'.
++#
+ # [*partition_rpc_topic*]
+-# define which topic the alarm evaluator should access
++# (optional) Define which topic the alarm evaluator should access
++# Defaults to 'alarm_partition_coordination'.
++#
+ # [*record_history*]
+-# Record alarm change events
++# (optional) Record alarm change events
++# Defaults to true.
#
class ceilometer::alarm::evaluator (
- $enabled = true,
@@ -126,7 +195,7 @@ index 2621534..7b2366e 100644
$evaluation_interval = 60,
$evaluation_service = 'ceilometer.alarm.service.SingletonAlarmService',
$partition_rpc_topic = 'alarm_partition_coordination',
-@@ -30,10 +31,12 @@ class ceilometer::alarm::evaluator (
+@@ -30,10 +44,12 @@ class ceilometer::alarm::evaluator (
Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
ensure_packages($::ceilometer::params::alarm_package_name)
@@ -144,18 +213,48 @@ index 2621534..7b2366e 100644
Package['ceilometer-common'] -> Service['ceilometer-alarm-evaluator']
diff --git a/manifests/alarm/notifier.pp b/manifests/alarm/notifier.pp
-index 1b09baa..29d9d2b 100644
+index 1b09baa..4bad221 100644
--- a/manifests/alarm/notifier.pp
+++ b/manifests/alarm/notifier.pp
-@@ -14,6 +14,7 @@
- # should the ssl verify parameter be enabled
+@@ -2,18 +2,31 @@
+ #
+ # == Params
+ # [*enabled*]
+-# should the service be enabled
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
++#
+ # [*notifier_rpc_topic*]
+-# define on which topic the notifier will have
+-# access
++# (optional) Define on which topic the notifier will have access.
++# Defaults to undef.
++#
+ # [*rest_notifier_certificate_key*]
+-# define the certificate key for the rest service
++# (optional) Define the certificate key for the rest service.
++# Defaults to undef.
++#
+ # [*rest_notifier_certificate_file*]
+-# define the certificate file for the rest service
++# (optional) Define the certificate file for the rest service.
++# Defaults to undef.
++#
+ # [*rest_notifier_ssl_verify*]
+-# should the ssl verify parameter be enabled
++# (optional) Should the ssl verify parameter be enabled.
++# Defaults to true.
#
class ceilometer::alarm::notifier (
+ $manage_service = true,
$enabled = true,
$notifier_rpc_topic = undef,
$rest_notifier_certificate_key = undef,
-@@ -31,10 +32,12 @@ class ceilometer::alarm::notifier (
+@@ -31,10 +44,12 @@ class ceilometer::alarm::notifier (
Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
ensure_packages($::ceilometer::params::alarm_package_name)
@@ -173,10 +272,74 @@ index 1b09baa..29d9d2b 100644
Package['ceilometer-common'] -> Service['ceilometer-alarm-notifier']
diff --git a/manifests/api.pp b/manifests/api.pp
-index 92406a8..9182ba2 100644
+index 92406a8..3ef9ba2 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
-@@ -37,6 +37,7 @@
+@@ -2,41 +2,54 @@
+ #
+ # == Parameters
+ # [*enabled*]
+-# should the service be enabled. Optional. Defaults to true
++# (optional) Should the service be enabled.
++# Defaults to true
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
+ #
+ # [*keystone_host*]
+-# keystone's admin endpoint IP/Host. Optional. Defaults to 127.0.0.1
++# (optional) Keystone's admin endpoint IP/Host.
++# Defaults to '127.0.0.1'
+ #
+ # [*keystone_port*]
+-# keystone's admin endpoint port. Optional. Defaults to 35357
++# (optional) Keystone's admin endpoint port.
++# Defaults to 35357
+ #
+ # [*keystone_auth_admin_prefix*]
+-# 'path' to the keystone admin endpoint. Optional. Defaults to false (empty)
++# (optional) 'path' to the keystone admin endpoint.
+ # Define to a path starting with a '/' and without trailing '/'.
+ # Eg.: '/keystone/admin' to match keystone::wsgi::apache default.
++# Defaults to false (empty)
+ #
+-# [*keystone_protocol*] http/https
+-# Optional. Defaults to https
++# [*keystone_protocol*]
++# (optional) 'http' or 'https'
++# Defaults to 'https'.
+ #
+-# [*keytone_user*] user to authenticate with
+-# Optional. Defaults to ceilometer
++# [*keytone_user*]
++# (optional) User to authenticate with.
++# Defaults to 'ceilometer'.
+ #
+-# [*keystone_tenant*] tenant to authenticate with
+-# Optional. Defaults to services
++# [*keystone_tenant*]
++# (optional) Tenant to authenticate with.
++# Defaults to 'services'.
+ #
+-# [*keystone_password*] password to authenticate with
++# [*keystone_password*]
++# Password to authenticate with.
+ # Mandatory.
+ #
+-# [*host*]
+-# (optional) The ceilometer api bind address
+-# Defaults to 0.0.0.0
++# [*host*]
++# (optional) The ceilometer api bind address.
++# Defaults to 0.0.0.0
+ #
+-# [*port*]
+-# (optional) The ceilometer api port
+-# Defaults to 8777
++# [*port*]
++# (optional) The ceilometer api port.
++# Defaults to 8777
#
class ceilometer::api (
@@ -184,7 +347,7 @@ index 92406a8..9182ba2 100644
$enabled = true,
$keystone_host = '127.0.0.1',
$keystone_port = '35357',
-@@ -63,10 +64,12 @@ class ceilometer::api (
+@@ -63,10 +76,12 @@ class ceilometer::api (
name => $::ceilometer::params::api_package_name,
}
@@ -202,11 +365,20 @@ index 92406a8..9182ba2 100644
Package['ceilometer-common'] -> Service['ceilometer-api']
diff --git a/manifests/collector.pp b/manifests/collector.pp
-index cc0661f..a489143 100644
+index 2506efb..8e1f6fc 100644
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
-@@ -5,7 +5,8 @@
- # should the service be enabled
+@@ -2,10 +2,16 @@
+ #
+ # == Params
+ # [*enabled*]
+-# should the service be enabled
++# (optional) Should the service be enabled.
++# Defaults to true.
++#
++# [*manage_service*]
++# (optional) Whether the service should be managed by Puppet.
++# Defaults to true.
#
class ceilometer::collector (
- $enabled = true,
@@ -215,23 +387,510 @@ index cc0661f..a489143 100644
) {
include ceilometer::params
-@@ -15,10 +16,12 @@ class ceilometer::collector (
+@@ -15,12 +21,14 @@ class ceilometer::collector (
Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector']
ensure_packages([$::ceilometer::params::collector_package_name])
- if $enabled {
- $service_ensure = 'running'
+- Class['ceilometer::db'] -> Service['ceilometer-collector']
+- Exec['ceilometer-dbsync'] ~> Service['ceilometer-collector']
- } else {
- $service_ensure = 'stopped'
+ if $manage_service {
+ if $enabled {
+ $service_ensure = 'running'
++ Class['ceilometer::db'] -> Service['ceilometer-collector']
++ Exec['ceilometer-dbsync'] ~> Service['ceilometer-collector']
+ } else {
+ $service_ensure = 'stopped'
+ }
}
Package['ceilometer-common'] -> Service['ceilometer-collector']
+diff --git a/spec/classes/ceilometer_agent_central_spec.rb b/spec/classes/ceilometer_agent_central_spec.rb
+index 5fab4c9..8a45c35 100644
+--- a/spec/classes/ceilometer_agent_central_spec.rb
++++ b/spec/classes/ceilometer_agent_central_spec.rb
+@@ -7,7 +7,8 @@ describe 'ceilometer::agent::central' do
+ end
+
+ let :params do
+- { :enabled => true }
++ { :enabled => true,
++ :manage_service => true }
+ end
+
+ shared_examples_for 'ceilometer-agent-central' do
+@@ -28,14 +29,40 @@ describe 'ceilometer::agent::central' do
+ )
+ end
+
+- it 'configures ceilometer-agent-central service' do
+- should contain_service('ceilometer-agent-central').with(
+- :ensure => 'running',
+- :name => platform_params[:agent_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true
+- )
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
++ before do
++ params.merge!(param_hash)
++ end
++
++ it 'configures ceilometer-agent-central service' do
++ should contain_service('ceilometer-agent-central').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:agent_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-agent-central service' do
++ should contain_service('ceilometer-agent-central').with(
++ :ensure => nil,
++ :name => platform_params[:agent_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
+ end
+
+ end
+diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
+index 16f19a0..d193bc1 100644
+--- a/spec/classes/ceilometer_agent_compute_spec.rb
++++ b/spec/classes/ceilometer_agent_compute_spec.rb
+@@ -9,7 +9,8 @@ describe 'ceilometer::agent::compute' do
+ end
+
+ let :params do
+- { :enabled => true }
++ { :enabled => true,
++ :manage_service => true }
+ end
+
+ shared_examples_for 'ceilometer-agent-compute' do
+@@ -38,16 +39,6 @@ describe 'ceilometer::agent::compute' do
+ )
+ end
+
+- it 'configures ceilometer-agent-compute service' do
+- should contain_service('ceilometer-agent-compute').with(
+- :ensure => 'running',
+- :name => platform_params[:agent_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true
+- )
+- end
+-
+ it 'configures nova notification driver' do
+ should contain_file_line_after('nova-notification-driver-common').with(
+ :line => 'notification_driver=nova.openstack.common.notifier.rpc_notifier',
+@@ -61,6 +52,43 @@ describe 'ceilometer::agent::compute' do
+ )
+ end
+
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
++ before do
++ params.merge!(param_hash)
++ end
++
++ it 'configures ceilometer-agent-compute service' do
++
++ should contain_service('ceilometer-agent-compute').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:agent_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-agent-compute service' do
++ should contain_service('ceilometer-agent-compute').with(
++ :ensure => nil,
++ :name => platform_params[:agent_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++
+ end
+
+ context 'on Debian platforms' do
+diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
+index a7ad76e..ed9c252 100644
+--- a/spec/classes/ceilometer_agent_notification_spec.rb
++++ b/spec/classes/ceilometer_agent_notification_spec.rb
+@@ -27,7 +27,9 @@ describe 'ceilometer::agent::notification' do
+ end
+
+ let :params do
+- { :ack_on_event_error => true,
++ { :manage_service => true,
++ :enabled => true,
++ :ack_on_event_error => true,
+ :store_events => false }
+ end
+
+@@ -39,21 +41,47 @@ describe 'ceilometer::agent::notification' do
+ should contain_package(platform_params[:agent_notification_package_name])
+ end
+
+- it 'configures ceilometer agent notification service' do
+- should contain_service('ceilometer-agent-notification').with(
+- :ensure => 'running',
+- :name => platform_params[:agent_notification_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true
+- )
+- end
+-
+ it 'configures notifications parameters in ceilometer.conf' do
+ should contain_ceilometer_config('notification/ack_on_event_error').with_value( params[:ack_on_event_error] )
+ should contain_ceilometer_config('notification/store_events').with_value( params[:store_events] )
+ end
+
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
++ before do
++ params.merge!(param_hash)
++ end
++
++ it 'configures ceilometer agent notification service' do
++ should contain_service('ceilometer-agent-notification').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:agent_notification_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-agent-notification service' do
++ should contain_service('ceilometer-agent-notification').with(
++ :ensure => nil,
++ :name => platform_params[:agent_notification_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++
+ end
+
+ context 'on Debian platforms' do
+diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
+index d017695..b2c4c48 100644
+--- a/spec/classes/ceilometer_alarm_evaluator_spec.rb
++++ b/spec/classes/ceilometer_alarm_evaluator_spec.rb
+@@ -12,6 +12,7 @@ describe 'ceilometer::alarm::evaluator' do
+ :partition_rpc_topic => 'alarm_partition_coordination',
+ :record_history => true,
+ :enabled => true,
++ :manage_service => true,
+ }
+ end
+
+@@ -32,17 +33,6 @@ describe 'ceilometer::alarm::evaluator' do
+ )
+ end
+
+- it 'configures ceilometer-alarm-evaluator service' do
+- should contain_service('ceilometer-alarm-evaluator').with(
+- :ensure => 'running',
+- :name => platform_params[:alarm_evaluator_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true
+- )
+- end
+-
+-
+ it 'configures alarm evaluator' do
+ should contain_ceilometer_config('alarm/evaluation_interval').with_value( params[:evaluation_interval] )
+ should contain_ceilometer_config('alarm/evaluation_service').with_value( params[:evaluation_service] )
+@@ -63,14 +53,50 @@ describe 'ceilometer::alarm::evaluator' do
+ it { should contain_ceilometer_config('alarm/partition_rpc_topic').with_value(params[:partition_rpc_topic]) }
+ end
+
+- context 'when override the evaluation interval with a non numeric value' do
++ context 'when override the evaluation interval with a non numeric value' do
++ before do
++ params.merge!(:evaluation_interval => 'NaN')
++ end
++
++ it { expect { should contain_ceilometer_config('alarm/evaluation_interval') }.to\
++ raise_error(Puppet::Error, /validate_re\(\): .* does not match/) }
++ end
++
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
+ before do
+- params.merge!(:evaluation_interval => 'NaN')
++ params.merge!(param_hash)
+ end
+
+- it { expect { should contain_ceilometer_config('alarm/evaluation_interval') }.to\
+- raise_error(Puppet::Error, /validate_re\(\): .* does not match/) }
++ it 'configures ceilometer-alarm-evaluator service' do
++ should contain_service('ceilometer-alarm-evaluator').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:alarm_evaluator_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-alarm-evaluator service' do
++ should contain_service('ceilometer-alarm-evaluator').with(
++ :ensure => nil,
++ :name => platform_params[:alarm_evaluator_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
+ end
++ end
+ end
+
+ context 'on Debian platforms' do
+diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
+index 6c40d43..d4e65a1 100644
+--- a/spec/classes/ceilometer_alarm_notifier_spec.rb
++++ b/spec/classes/ceilometer_alarm_notifier_spec.rb
+@@ -13,6 +13,7 @@ describe 'ceilometer::alarm::notifier' do
+ #:rest_notifier_certificate_file => 'UNSET',
+ #:rest_notifier_ssl_verify => true,
+ :enabled => true,
++ :manage_service => true,
+ }
+ end
+
+@@ -33,17 +34,6 @@ describe 'ceilometer::alarm::notifier' do
+ )
+ end
+
+- it 'configures ceilometer-alarm-notifier service' do
+- should contain_service('ceilometer-alarm-notifier').with(
+- :ensure => 'running',
+- :name => platform_params[:alarm_notifier_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true
+- )
+- end
+-
+-
+ it 'configures alarm notifier' do
+ should_not contain_ceilometer_config('alarm/notifier_rpc_topic')
+ should_not contain_ceilometer_config('alarm/rest_notifier_certificate_key')
+@@ -64,6 +54,42 @@ describe 'ceilometer::alarm::notifier' do
+ it { should contain_ceilometer_config('alarm/rest_notifier_ssl_verify').with_value(params[:rest_notifier_ssl_verify]) }
+ end
+
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
++ before do
++ params.merge!(param_hash)
++ end
++
++ it 'configures ceilometer-alarm-notifier service' do
++ should contain_service('ceilometer-alarm-notifier').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:alarm_notifier_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-alarm-notifier service' do
++ should contain_service('ceilometer-alarm-notifier').with(
++ :ensure => nil,
++ :name => platform_params[:alarm_notifier_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++
+ end
+
+ context 'on Debian platforms' do
+diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
+index 546f92f..924ed15 100644
+--- a/spec/classes/ceilometer_api_spec.rb
++++ b/spec/classes/ceilometer_api_spec.rb
+@@ -8,6 +8,7 @@ describe 'ceilometer::api' do
+
+ let :params do
+ { :enabled => true,
++ :manage_service => true,
+ :keystone_host => '127.0.0.1',
+ :keystone_port => '35357',
+ :keystone_protocol => 'http',
+@@ -35,18 +36,6 @@ describe 'ceilometer::api' do
+ )
+ end
+
+- it 'configures ceilometer-api service' do
+- should contain_service('ceilometer-api').with(
+- :ensure => 'running',
+- :name => platform_params[:api_service_name],
+- :enable => true,
+- :hasstatus => true,
+- :hasrestart => true,
+- :require => 'Class[Ceilometer::Db]',
+- :subscribe => 'Exec[ceilometer-dbsync]'
+- )
+- end
+-
+ it 'configures keystone authentication middleware' do
+ should contain_ceilometer_config('keystone_authtoken/auth_host').with_value( params[:keystone_host] )
+ should contain_ceilometer_config('keystone_authtoken/auth_port').with_value( params[:keystone_port] )
+@@ -82,6 +71,44 @@ describe 'ceilometer::api' do
+ end
+ end
+ end
++
++ [{:enabled => true}, {:enabled => false}].each do |param_hash|
++ context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
++ before do
++ params.merge!(param_hash)
++ end
++
++ it 'configures ceilometer-api service' do
++ should contain_service('ceilometer-api').with(
++ :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
++ :name => platform_params[:api_service_name],
++ :enable => params[:enabled],
++ :hasstatus => true,
++ :hasrestart => true,
++ :require => 'Class[Ceilometer::Db]',
++ :subscribe => 'Exec[ceilometer-dbsync]'
++ )
++ end
++ end
++ end
++
++ context 'with disabled service managing' do
++ before do
++ params.merge!({
++ :manage_service => false,
++ :enabled => false })
++ end
++
++ it 'configures ceilometer-api service' do
++ should contain_service('ceilometer-api').with(
++ :ensure => nil,
++ :name => platform_params[:api_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
+ end
+
+ context 'on Debian platforms' do
+diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
+index 25e6d65..72f2510 100644
+--- a/spec/classes/ceilometer_collector_spec.rb
++++ b/spec/classes/ceilometer_collector_spec.rb
+@@ -42,6 +42,33 @@ describe 'ceilometer::collector' do
+
+ # Catalog compilation does not crash for lack of ceilometer::db
+ it { should compile }
++
++ it 'configures ceilometer-collector service' do
++ should contain_service('ceilometer-collector').with(
++ :ensure => 'stopped',
++ :name => platform_params[:collector_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
++ end
++
++ context 'when service management is disabled' do
++ let :params do
++ { :enabled => false,
++ :manage_service => false }
++ end
++
++ it 'configures ceilometer-collector service' do
++ should contain_service('ceilometer-collector').with(
++ :ensure => nil,
++ :name => platform_params[:collector_service_name],
++ :enable => false,
++ :hasstatus => true,
++ :hasrestart => true
++ )
++ end
+ end
+ end
+
--
1.9.3
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index b1c0124..f17b10c 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,49 +1,49 @@
-%global apache_commit bbf9278b24931444022aa67140d3505b748151da
-%global ceilometer_commit c2f41fb1eb776bcfdaab79c120ac509a861d0828
-%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
-%global cinder_commit 57da044279780af66479c429e5803825a87b785e
-%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
-%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
-%global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5
-%global galera_commit e35922bbb31ef2e6a86c7973cbafea96a8b160af
-%global glance_commit cb0daf02d7a991be642e62294912d93b036c6a5a
-%global gluster_commit 80c2b13448c97c70a4b4bc0e402e00ecb5d681d5
-%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
-%global heat_commit 17736b2fd726858cb83590f8a8b1d594a087ea44
-%global horizon_commit bd1c31e87dd0564a8fab8de0516dbbe48241b09a
-%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
-%global keystone_commit e61e4c2ab5c67150237e59dab25679ec739d3ebf
-%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
-%global module_data_commit 159fc5e0e21ce9df96c777f0064b5eca88e29cae
-%global mongodb_commit 0518f864afcce2ebb79f1f2edab5de323c811af7
-%global mysql_commit 8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f
-%global n1k_vsm_commit 69ff094069506f98431182c6097b3b6b9ea6fdb9
-%global neutron_commit ceeeb6ce1eca67284d0913f40db088cfdf728797
-%global nova_commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c
-%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
-%global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951
-%global pacemaker_commit 0ed9ee8a29c0f27e86727d415b39d2715332df7d
-%global puppet_commit 07ec49d1f67a498b31b4f164678a76c464e129c4
-%global qpid_commit 1f0c32b39ad17e7acbd440b50fb6f0875971f5e1
-%global rabbitmq_commit e7447851a60a419cd51a09ccf807964b36fdebac
-%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
-%global sahara_commit f4e5681cfb289113be1ba49c12709145ecbad938
-%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
-%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
-%global stdlib_commit 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
-%global swift_commit 80ec3a7576efad5e13d37a8c760ed0ad7f36055f
-%global sysctl_commit c4486acc2d66de857dbccd8b4b945ea803226705
-%global tempest_commit 792be887b61ad9c38706e968a21752cfb05c2381
-%global vcsrepo_commit 6f7507a2a48ff0a58c7db026760a2eb84e382a77
-%global vlan_commit c937de75c28e63fba8d8738ad6a5f2ede517e53d
-%global vswitch_commit a20f6355f048d2cb6206222b2d045b41ac875db4
-%global xinetd_commit 6b02de8d4f30a819eb404048e4258e3a5e8023c8
+%global apache_commit 769ff363a8a3c51e24f63a2494217d2d029289c6
+%global ceilometer_commit aa3933ccde8a4f8d39736a2d503cb085d4fae998
+%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
+%global cinder_commit 4f8ce803de9cf0f1a2031f4427714346bf06127f
+%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
+%global concat_commit 644fb1b6dc8b64accc4d1208d6127b79a08a38b7
+%global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5
+%global galera_commit e35922bbb31ef2e6a86c7973cbafea96a8b160af
+%global glance_commit cb0daf02d7a991be642e62294912d93b036c6a5a
+%global gluster_commit 8da4002f83e6505c7c09042df1c10cb1e290c7c7
+%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
+%global heat_commit 17736b2fd726858cb83590f8a8b1d594a087ea44
+%global horizon_commit bd1c31e87dd0564a8fab8de0516dbbe48241b09a
+%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
+%global keystone_commit e61e4c2ab5c67150237e59dab25679ec739d3ebf
+%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
+%global module_data_commit 159fc5e0e21ce9df96c777f0064b5eca88e29cae
+%global mongodb_commit 0518f864afcce2ebb79f1f2edab5de323c811af7
+%global mysql_commit 98152e358626915ab7d918a21b21edbffe46504d
+%global n1k_vsm_commit 69ff094069506f98431182c6097b3b6b9ea6fdb9
+%global neutron_commit 0a7e0f1b7fbed8805ef7bac15409753491dd2274
+%global nova_commit 0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb
+%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
+%global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951
+%global pacemaker_commit 0ed9ee8a29c0f27e86727d415b39d2715332df7d
+%global puppet_commit bd467cae15eba9ca44274034d2593b0eaf30518d
+%global qpid_commit 1f0c32b39ad17e7acbd440b50fb6f0875971f5e1
+%global rabbitmq_commit e7447851a60a419cd51a09ccf807964b36fdebac
+%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
+%global sahara_commit f4e5681cfb289113be1ba49c12709145ecbad938
+%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
+%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
+%global stdlib_commit 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
+%global swift_commit 80ec3a7576efad5e13d37a8c760ed0ad7f36055f
+%global sysctl_commit c4486acc2d66de857dbccd8b4b945ea803226705
+%global tempest_commit 792be887b61ad9c38706e968a21752cfb05c2381
+%global vcsrepo_commit 6f7507a2a48ff0a58c7db026760a2eb84e382a77
+%global vlan_commit c937de75c28e63fba8d8738ad6a5f2ede517e53d
+%global vswitch_commit 17b62e56e07eeed25fd2aaef278a16c97155a115
+%global xinetd_commit 6b02de8d4f30a819eb404048e4258e3a5e8023c8
Name: openstack-puppet-modules
Version: 2014.1
-Release: 24.3%{?dist}
+Release: 25%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
URL: https://github.com/redhat-openstack
@@ -87,7 +87,7 @@ Source35: https://github.com/puppetlabs/puppetlabs-vcsrepo/archive/%{vcsrepo_co
Source36: https://github.com/derekhiggins/puppet-vlan/archive/%{vlan_commit}/vlan-%{vlan_commit}.tar.gz
Source37: https://github.com/stackforge/puppet-vswitch/archive/%{vswitch_commit}/vswitch-%{vswitch_commit}.tar.gz
Source38: https://github.com/puppetlabs/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
-Source39: https://github.com/stackforge/puppet-n1k-vsm/archive/%{n1k_vsm_commit}/n1k-vsm-%{n1k_vsm_commit}.tar.gz
+Source39: https://github.com/stackforge/puppet-n1k-vsm/archive/%{n1k_vsm_commit}/n1k-vsm-%{n1k_vsm_commit}.tar.gz
# stable patches
Patch0: rdo-documentation.patch
@@ -96,14 +96,12 @@ Patch1: rabbitmq-repo-manage.patch
# temporary patches
Patch100: compute_driver.patch
Patch101: openstack.patch
-Patch103: 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
Patch104: puppetlabs-firewall-pull-request-337.patch
Patch105: puppetlabs-firewall-pull-request-365.patch
Patch106: puppetlabs-firewall-pull-request-367-2.patch
Patch107: 0001-Implement-Keystone-domain-creation.patch
-Patch109: 0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
Patch110: 0001-stop-puppet-from-breaking-neutron.patch
-Patch113: 0001-Remove-ability-to-manage-the-nova-uid-gid.patch
+Patch113: 0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch
Patch114: 0001-Install-ceph-client-libraries-when-using-rbd.patch
Patch115: 0001-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
Patch116: 0001-Just-clean-original-config.patch
@@ -117,8 +115,6 @@ Patch123: manage_service-glance.patch
Patch124: manage_service-neutron.patch
Patch125: 0001-vlan-is-not-the-same-as-vlan_start.patch
Patch126: 0001-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
-Patch127: 0001-Fixed-ovs-provider.patch
-Patch128: 0001-Fixes-bridge-interface-name-check.patch
BuildArch: noarch
Requires: rubygem-json
@@ -178,7 +174,6 @@ cd %{_builddir}/%{name}-%{version}/puppet-horizon-%{horizon_commit}
# puppet-nova patches
cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
%patch100 -p1
-%patch103 -p1
%patch113 -p1
%patch114 -p1
%patch125 -p1
@@ -206,12 +201,6 @@ cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch124 -p1
%patch126 -p1
-# puppet-vswitch patches
-cd %{_builddir}/%{name}-%{version}/puppet-vswitch-%{vswitch_commit}
-%patch127 -p1
-%patch128 -p1
-%patch109 -p1
-
# puppetlabs-rabbitmq patches
cd %{_builddir}/%{name}-%{version}/puppetlabs-rabbitmq-%{rabbitmq_commit}
%patch1 -p1
@@ -294,8 +283,13 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Oct 24 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-25
+- Updated to 2014.1-25 (puppet-cinder, puppetlabs-concat, puppet-ceilometer)
+- Fixed rest of modules to be in sync with upstream repo
+- Removed unnecessary patches
+
* Wed Oct 14 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-24.3
-- [ERRATA] Uploaded missing patches
+- [ERRATA] Uploaded missing patches
* Wed Oct 14 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-24.2
- Updated sources
@@ -307,7 +301,7 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
* Mon Oct 13 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-24
- Added the n1k-vsm module (rhbz#1121788)
-- Bumped mongodb to latest commit
+- Bumped mongodb to latest commit
- Added 0001-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
(rhbz#1127340)
- Bumped neutron to latest icehouse stable (rhbz#1121788)
diff --git a/sources b/sources
index 925f0e6..e3c48a6 100644
--- a/sources
+++ b/sources
@@ -1,13 +1,13 @@
-390ce952e348614338df23de3d1d2974 apache-bbf9278b24931444022aa67140d3505b748151da.tar.gz
-720d47361dec959d7c82ec29d29eb8a2 ceilometer-c2f41fb1eb776bcfdaab79c120ac509a861d0828.tar.gz
+7f8b4d8f9175173e2b4dd9b779d132c8 apache-769ff363a8a3c51e24f63a2494217d2d029289c6.tar.gz
+59b1194fe8f4ea8c362b98d3001cc071 ceilometer-aa3933ccde8a4f8d39736a2d503cb085d4fae998.tar.gz
35c3c53f442b591a4da3bfa75610069d certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
-31a83978552544766dfa14cb1dddcb80 cinder-57da044279780af66479c429e5803825a87b785e.tar.gz
+7cec3ddc47ac7beaf7f14174fa94f595 cinder-4f8ce803de9cf0f1a2031f4427714346bf06127f.tar.gz
6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz
-8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
+3c9eb814f24e276f7198889c3fa8ea15 concat-644fb1b6dc8b64accc4d1208d6127b79a08a38b7.tar.gz
3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz
6aaf62820b0c206be54c0a792bc58d5a galera-e35922bbb31ef2e6a86c7973cbafea96a8b160af.tar.gz
590eefb9f7520cf37b3513031dba426f glance-cb0daf02d7a991be642e62294912d93b036c6a5a.tar.gz
-7d21112588ba43525f2006fd65a00b07 gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.gz
+b54c34d8b2137625d26b44f9616cd4fb gluster-8da4002f83e6505c7c09042df1c10cb1e290c7c7.tar.gz
edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
1968e37175f6f9306d2c4b95e04a4ec6 heat-17736b2fd726858cb83590f8a8b1d594a087ea44.tar.gz
4005e51f0d86735bbe53836b84112b3d horizon-bd1c31e87dd0564a8fab8de0516dbbe48241b09a.tar.gz
@@ -16,14 +16,14 @@ b92cb5bb97ea2c2ccdd6fbd361cbb2e7 inifile-fe9b0d5229ea37179a08c4b49239da9bc950ac
d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
8506a98c0ceddf5299bdfe579e256c3f module-data-159fc5e0e21ce9df96c777f0064b5eca88e29cae.tar.gz
7b81ce16b4b80c1e5e9d9ab768e75abc mongodb-0518f864afcce2ebb79f1f2edab5de323c811af7.tar.gz
-9a74df5dd93d041d7f0095ca769294c9 mysql-8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f.tar.gz
+a2f1709b943b95a79a92f6c4be93dba4 mysql-98152e358626915ab7d918a21b21edbffe46504d.tar.gz
ccccd1eea52c642122ff2dd0849c1571 n1k-vsm-69ff094069506f98431182c6097b3b6b9ea6fdb9.tar.gz
-773495b3c42fb1e195ed8a9be9876ec0 neutron-ceeeb6ce1eca67284d0913f40db088cfdf728797.tar.gz
-2f0d23068f0eb1916755787b1d7bb9ae nova-1e77a9d48a85a3ae6d30993b3c887f58e4a5973c.tar.gz
+7156ba58d25897f73324842888945878 neutron-0a7e0f1b7fbed8805ef7bac15409753491dd2274.tar.gz
+0c2d1ad1dac1c27b6fe75a016a3052d7 nova-0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb.tar.gz
ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz
da027803b368c3790ad8421ce8c3a3ac pacemaker-0ed9ee8a29c0f27e86727d415b39d2715332df7d.tar.gz
-625ce5ea3a37e0d1e4a0b1c09b6495ff puppet-07ec49d1f67a498b31b4f164678a76c464e129c4.tar.gz
+a108ddcf6b9e1c86564069f9fa8f0c47 puppet-bd467cae15eba9ca44274034d2593b0eaf30518d.tar.gz
0597e6eb94ca2cbbf3b22b4294e60dae qpid-1f0c32b39ad17e7acbd440b50fb6f0875971f5e1.tar.gz
a05c3e7ba8e2055a15901d1ddbd8cb79 rabbitmq-e7447851a60a419cd51a09ccf807964b36fdebac.tar.gz
b5d0c1c4cd711a3f762052813ad6a1bc rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
@@ -36,5 +36,5 @@ ed84fcfd855b066f6d74777d5d6b76cc sahara-f4e5681cfb289113be1ba49c12709145ecbad93
5905e569c1cff4429600d387e79de0f2 tempest-792be887b61ad9c38706e968a21752cfb05c2381.tar.gz
ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-d0808da5ad0ac1227a2d2d78ff66a9b1 vswitch-a20f6355f048d2cb6206222b2d045b41ac875db4.tar.gz
+f7e96d9250232b7b6826dbeeee17ad96 vswitch-17b62e56e07eeed25fd2aaef278a16c97155a115.tar.gz
575157496e3c7027df7be4d1f0f19eb9 xinetd-6b02de8d4f30a819eb404048e4258e3a5e8023c8.tar.gz
More information about the scm-commits
mailing list