[openstack-puppet-modules/f21] Updated to 2014.1-22
Martin Mágr
mmagr at fedoraproject.org
Thu Sep 4 20:22:12 UTC 2014
commit b1dd334885f85e0aea29519176eb18f1944fcbd0
Author: Martin Mágr <mmagr at redhat.com>
Date: Thu Sep 4 22:21:41 2014 +0200
Updated to 2014.1-22
0001-Fixed-ovs-provider.patch | 259 --------------------
0001-Fixes-bridge-interface-name-check.patch | 27 --
...Remove-ability-to-manage-the-nova-uid-gid.patch | 52 ++---
nova.patch | 15 --
openstack-puppet-modules.spec | 185 +++++++-------
sources | 21 +-
6 files changed, 120 insertions(+), 439 deletions(-)
---
diff --git a/0001-Remove-ability-to-manage-the-nova-uid-gid.patch b/0001-Remove-ability-to-manage-the-nova-uid-gid.patch
index 9ce8ff6..224bcbf 100644
--- a/0001-Remove-ability-to-manage-the-nova-uid-gid.patch
+++ b/0001-Remove-ability-to-manage-the-nova-uid-gid.patch
@@ -1,7 +1,7 @@
-From ea0541fea9310cd52e30fa2140c60c7bc75e0883 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] Remove ability to manage the nova uid/gid.
+From 0695d85160fa02cd5332e8a70efac221a6f0e104 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Thu, 4 Sep 2014 21:55:12 +0200
+Subject: [PATCH 3/5] Remove ability to manage the nova uid/gid.
Any user modification before standard system package creates the
user is wrong. Usecase of patch adding the user is also broken as
@@ -13,17 +13,16 @@ user as it's provided by package on all supported systems.
Closes-Bug: rhbz#1115946
Change-Id: If22b27f5fb78ba6821f4d6e8c275f8b80c70dd59
-(cherry picked from commit 9e8bc0bac87efdf0d31fd62d638bce8106b3e7df)
---
manifests/compute/libvirt.pp | 2 +-
manifests/consoleauth.pp | 2 +-
- manifests/init.pp | 41 +----------------------------------------
+ manifests/init.pp | 22 +---------------------
manifests/objectstore.pp | 2 +-
spec/classes/nova_init_spec.rb | 40 +---------------------------------------
- 5 files changed, 5 insertions(+), 82 deletions(-)
+ 5 files changed, 5 insertions(+), 63 deletions(-)
diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
-index 5fd9f40..83073da 100644
+index fe6ea33..a0a1712 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -105,7 +105,7 @@ class nova::compute::libvirt (
@@ -49,41 +48,20 @@ index 953e712..4813b36 100644
}
diff --git a/manifests/init.pp b/manifests/init.pp
-index 3202db0..3526919 100644
+index 3202db0..648a047 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
-@@ -175,20 +175,6 @@
- # (optional) Syslog facility to receive log lines.
- # Defaults to 'LOG_USER'
- #
--# [*nova_user_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.
--# 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.
--# Defaults to undef.
--#
- # [*nova_public_key*]
- # (optional) Install public key in .ssh/authorized_keys for the 'nova' user.
- # Expects a hash of the form { type => 'key-type', key => 'key-data' } where
-@@ -271,8 +257,6 @@
- $periodic_interval = '60',
- $report_interval = '10',
- $rootwrap_config = '/etc/nova/rootwrap.conf',
+@@ -297,8 +297,6 @@ class nova(
+ $ca_file = false,
+ $cert_file = false,
+ $key_file = false,
- $nova_user_id = undef,
- $nova_group_id = undef,
$nova_public_key = undef,
$nova_private_key = undef,
$nova_shell = '/bin/false',
-@@ -299,24 +283,6 @@
- warning('The nova_cluster_id parameter is deprecated and has no effect.')
+@@ -339,24 +337,6 @@ class nova(
+ }
}
- group { 'nova':
@@ -107,7 +85,7 @@ index 3202db0..3526919 100644
if $nova_public_key or $nova_private_key {
file { '/var/lib/nova/.ssh':
ensure => directory,
-@@ -405,7 +371,7 @@
+@@ -445,7 +425,7 @@ class nova(
package { 'nova-common':
ensure => $ensure_package,
name => $::nova::params::common_package_name,
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 4982b32..cec39cd 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,92 +1,91 @@
-%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 3f392925710f1758a95f1775d700b5fb787a003d
-%global mysql_commit 8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f
-%global neutron_commit d7ea12e36542204ed737d3514e2f05f2846fd330
-%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 c2f41fb1eb776bcfdaab79c120ac509a861d0828
+%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
+%global cinder_commit be74bc69283510c8a31bce71e153a2a152342683
+%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
+%global concat_commit 07bba0bcad2e3a2baf19dbff8b1a5146d9141153
+%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 3f392925710f1758a95f1775d700b5fb787a003d
+%global mysql_commit 8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f
+%global neutron_commit d7ea12e36542204ed737d3514e2f05f2846fd330
+%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 b7a15fc68c1c8e1e463c7d9e60a80f8c805fc11a
+%global xinetd_commit 6b02de8d4f30a819eb404048e4258e3a5e8023c8
Name: openstack-puppet-modules
Version: 2014.1
-Release: 21.1%{?dist}
+Release: 22%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
URL: https://github.com/redhat-openstack
-
-Source0: https://github.com/puppetlabs/puppetlabs-apache/archive/%{apache_commit}/apache-%{apache_commit}.tar.gz
-Source1: https://github.com/stackforge/puppet-ceilometer/archive/%{ceilometer_commit}/ceilometer-%{ceilometer_commit}.tar.gz
-Source2: https://github.com/rcritten/puppet-certmonger/archive/%{certmonger_commit}/certmonger-%{certmonger_commit}.tar.gz
-Source3: https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/cinder-%{cinder_commit}.tar.gz
-Source4: https://github.com/purpleidea/puppet-common/archive/%{common_commit}/common-%{common_commit}.tar.gz
-Source5: https://github.com/ripienaar/puppet-concat/archive/%{concat_commit}/concat-%{concat_commit}.tar.gz
-Source6: https://github.com/puppetlabs/puppetlabs-firewall/archive/%{firewall_commit}/firewall-%{firewall_commit}.tar.gz
-Source7: https://github.com/rohara/puppet-galera/archive/%{galera_commit}/galera-%{galera_commit}.tar.gz
-Source8: https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/glance-%{glance_commit}.tar.gz
-Source9: https://github.com/purpleidea/puppet-gluster/archive/%{gluster_commit}/gluster-%{gluster_commit}.tar.gz
-Source10: https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/haproxy-%{haproxy_commit}.tar.gz
-Source11: https://github.com/stackforge/puppet-heat/archive/%{heat_commit}/heat-%{heat_commit}.tar.gz
-Source12: https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/horizon-%{horizon_commit}.tar.gz
-Source13: https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/inifile-%{inifile_commit}.tar.gz
-Source14: https://github.com/stackforge/puppet-keystone/archive/%{keystone_commit}/keystone-%{keystone_commit}.tar.gz
-Source15: https://github.com/saz/puppet-memcached/archive/%{memcached_commit}/memcached-%{memcached_commit}.tar.gz
-Source16: https://github.com/ripienaar/puppet-module-data/archive/%{module_data_commit}/module-data-%{module_data_commit}.tar.gz
-Source17: https://github.com/puppetlabs/puppetlabs-mongodb/archive/%{mongodb_commit}/mongodb-%{mongodb_commit}.tar.gz
-Source18: https://github.com/packstack/puppetlabs-mysql/archive/%{mysql_commit}/mysql-%{mysql_commit}.tar.gz
-Source19: https://github.com/stackforge/puppet-neutron/archive/%{neutron_commit}/neutron-%{neutron_commit}.tar.gz
-Source20: https://github.com/stackforge/puppet-nova/archive/%{nova_commit}/nova-%{nova_commit}.tar.gz
-Source21: https://github.com/rcritten/puppet-nssdb/archive/%{nssdb_commit}/nssdb-%{nssdb_commit}.tar.gz
-Source22: https://github.com/stackforge/puppet-openstack/archive/%{openstack_commit}/openstack-%{openstack_commit}.tar.gz
-Source23: https://github.com/radez/puppet-pacemaker/archive/%{pacemaker_commit}/pacemaker-%{pacemaker_commit}.tar.gz
-Source24: https://github.com/purpleidea/puppet-puppet/archive/%{puppet_commit}/puppet-%{puppet_commit}.tar.gz
-Source25: https://github.com/dprince/puppet-qpid/archive/%{qpid_commit}/qpid-%{qpid_commit}.tar.gz
-Source26: https://github.com/puppetlabs/puppetlabs-rabbitmq/archive/%{rabbitmq_commit}/rabbitmq-%{rabbitmq_commit}.tar.gz
-Source27: https://github.com/puppetlabs/puppetlabs-rsync/archive/%{rsync_commit}/rsync-%{rsync_commit}.tar.gz
-Source28: https://github.com/stackforge/puppet-sahara/archive/%{sahara_commit}/sahara-%{sahara_commit}.tar.gz
-Source29: https://github.com/saz/puppet-ssh/archive/%{ssh_commit}/ssh-%{ssh_commit}.tar.gz
-Source30: https://github.com/nanliu/puppet-staging/archive/%{staging_commit}/staging-%{staging_commit}.tar.gz
-Source31: https://github.com/puppetlabs/puppetlabs-stdlib/archive/%{stdlib_commit}/stdlib-%{stdlib_commit}.tar.gz
-Source32: https://github.com/stackforge/puppet-swift/archive/%{swift_commit}/swift-%{swift_commit}.tar.gz
-Source33: https://github.com/puppetlabs/puppetlabs-sysctl/archive/%{sysctl_commit}/sysctl-%{sysctl_commit}.tar.gz
-Source34: https://github.com/stackforge/puppet-tempest/archive/%{tempest_commit}/tempest-%{tempest_commit}.tar.gz
-Source35: https://github.com/puppetlabs/puppetlabs-vcsrepo/archive/%{vcsrepo_commit}/vcsrepo-%{vcsrepo_commit}.tar.gz
-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/packstack/puppetlabs-xinetd/archive/%{xinetd_commit}/xinetd-%{xinetd_commit}.tar.gz
+Source0: https://github.com/puppetlabs/puppetlabs-apache/archive/%{apache_commit}/apache-%{apache_commit}.tar.gz
+Source1: https://github.com/stackforge/puppet-ceilometer/archive/%{ceilometer_commit}/ceilometer-%{ceilometer_commit}.tar.gz
+Source2: https://github.com/rcritten/puppet-certmonger/archive/%{certmonger_commit}/certmonger-%{certmonger_commit}.tar.gz
+Source3: https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/cinder-%{cinder_commit}.tar.gz
+Source4: https://github.com/purpleidea/puppet-common/archive/%{common_commit}/common-%{common_commit}.tar.gz
+Source5: https://github.com/puppetlabs/puppetlabs-concat/archive/%{concat_commit}/concat-%{concat_commit}.tar.gz
+Source6: https://github.com/puppetlabs/puppetlabs-firewall/archive/%{firewall_commit}/firewall-%{firewall_commit}.tar.gz
+Source7: https://github.com/rohara/puppet-galera/archive/%{galera_commit}/galera-%{galera_commit}.tar.gz
+Source8: https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/glance-%{glance_commit}.tar.gz
+Source9: https://github.com/purpleidea/puppet-gluster/archive/%{gluster_commit}/gluster-%{gluster_commit}.tar.gz
+Source10: https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/haproxy-%{haproxy_commit}.tar.gz
+Source11: https://github.com/stackforge/puppet-heat/archive/%{heat_commit}/heat-%{heat_commit}.tar.gz
+Source12: https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/horizon-%{horizon_commit}.tar.gz
+Source13: https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/inifile-%{inifile_commit}.tar.gz
+Source14: https://github.com/stackforge/puppet-keystone/archive/%{keystone_commit}/keystone-%{keystone_commit}.tar.gz
+Source15: https://github.com/saz/puppet-memcached/archive/%{memcached_commit}/memcached-%{memcached_commit}.tar.gz
+Source16: https://github.com/ripienaar/puppet-module-data/archive/%{module_data_commit}/module-data-%{module_data_commit}.tar.gz
+Source17: https://github.com/puppetlabs/puppetlabs-mongodb/archive/%{mongodb_commit}/mongodb-%{mongodb_commit}.tar.gz
+Source18: https://github.com/packstack/puppetlabs-mysql/archive/%{mysql_commit}/mysql-%{mysql_commit}.tar.gz
+Source19: https://github.com/stackforge/puppet-neutron/archive/%{neutron_commit}/neutron-%{neutron_commit}.tar.gz
+Source20: https://github.com/stackforge/puppet-nova/archive/%{nova_commit}/nova-%{nova_commit}.tar.gz
+Source21: https://github.com/rcritten/puppet-nssdb/archive/%{nssdb_commit}/nssdb-%{nssdb_commit}.tar.gz
+Source22: https://github.com/stackforge/puppet-openstack/archive/%{openstack_commit}/openstack-%{openstack_commit}.tar.gz
+Source23: https://github.com/radez/puppet-pacemaker/archive/%{pacemaker_commit}/pacemaker-%{pacemaker_commit}.tar.gz
+Source24: https://github.com/purpleidea/puppet-puppet/archive/%{puppet_commit}/puppet-%{puppet_commit}.tar.gz
+Source25: https://github.com/dprince/puppet-qpid/archive/%{qpid_commit}/qpid-%{qpid_commit}.tar.gz
+Source26: https://github.com/puppetlabs/puppetlabs-rabbitmq/archive/%{rabbitmq_commit}/rabbitmq-%{rabbitmq_commit}.tar.gz
+Source27: https://github.com/puppetlabs/puppetlabs-rsync/archive/%{rsync_commit}/rsync-%{rsync_commit}.tar.gz
+Source28: https://github.com/stackforge/puppet-sahara/archive/%{sahara_commit}/sahara-%{sahara_commit}.tar.gz
+Source29: https://github.com/saz/puppet-ssh/archive/%{ssh_commit}/ssh-%{ssh_commit}.tar.gz
+Source30: https://github.com/nanliu/puppet-staging/archive/%{staging_commit}/staging-%{staging_commit}.tar.gz
+Source31: https://github.com/puppetlabs/puppetlabs-stdlib/archive/%{stdlib_commit}/stdlib-%{stdlib_commit}.tar.gz
+Source32: https://github.com/stackforge/puppet-swift/archive/%{swift_commit}/swift-%{swift_commit}.tar.gz
+Source33: https://github.com/puppetlabs/puppetlabs-sysctl/archive/%{sysctl_commit}/sysctl-%{sysctl_commit}.tar.gz
+Source34: https://github.com/stackforge/puppet-tempest/archive/%{tempest_commit}/tempest-%{tempest_commit}.tar.gz
+Source35: https://github.com/puppetlabs/puppetlabs-vcsrepo/archive/%{vcsrepo_commit}/vcsrepo-%{vcsrepo_commit}.tar.gz
+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
# stable patches
Patch0: rdo-documentation.patch
@@ -95,16 +94,13 @@ Patch1: rabbitmq-repo-manage.patch
# temporary patches
Patch100: compute_driver.patch
Patch101: openstack.patch
-Patch102: nova.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
-Patch108: 0001-Fixed-ovs-provider.patch
Patch109: 0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
Patch110: 0001-stop-puppet-from-breaking-neutron.patch
-Patch111: 0001-Fixes-bridge-interface-name-check.patch
Patch112: cinder-target-service.patch
Patch113: 0001-Remove-ability-to-manage-the-nova-uid-gid.patch
Patch114: 0001-Install-ceph-client-libraries-when-using-rbd.patch
@@ -145,7 +141,7 @@ A collection of Puppet modules used to install and configure OpenStack.
%setup -c -q -T -D -a 13
%setup -c -q -T -D -a 14
%setup -c -q -T -D -a 15
-#%setup -c -q -T -D -a 16
+%setup -c -q -T -D -a 16
%setup -c -q -T -D -a 17
%setup -c -q -T -D -a 18
%setup -c -q -T -D -a 19
@@ -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
-%patch102 -p1
%patch103 -p1
%patch113 -p1
%patch114 -p1
@@ -208,9 +203,7 @@ cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
# puppet-vswitch patches
cd %{_builddir}/%{name}-%{version}/puppet-vswitch-%{vswitch_commit}
-%patch108 -p1
%patch109 -p1
-%patch111 -p1
# puppetlabs-rabbitmq patches
cd %{_builddir}/%{name}-%{version}/puppetlabs-rabbitmq-%{rabbitmq_commit}
@@ -266,7 +259,7 @@ cp -r puppet-horizon-%{horizon_commit} %{buildroot}/%{_datadir}/openstack-puppet
cp -r puppetlabs-inifile-%{inifile_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/inifile
cp -r puppet-keystone-%{keystone_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/keystone
cp -r puppet-memcached-%{memcached_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached
-#cp -r puppet-module-data-%{module_data_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/module-data
+cp -r puppet-module-data-%{module_data_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/module-data
cp -r puppetlabs-mongodb-%{mongodb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb
cp -r puppetlabs-mysql-%{mysql_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mysql
cp -r puppet-neutron-%{neutron_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
@@ -297,6 +290,18 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Thu Sep 04 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-22
+- Updated puppetlabs-apache
+- Updated puppet-cinde
+- Updated puppetlabs-concat
+- Updated puppet-gluster
+- Updated puppet-nova
+- Updated puppet-puppet
+- Updated puppet-vswitch
+- Removed nova.patch
+- Removed 0001-Fixed-ovs-provider.patch
+- Removed 0001-Fixes-bridge-interface-name-check.patch
+
* Wed Sep 03 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-21.1
- Errata: Wrong previous commit message
@@ -319,7 +324,7 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
* Mon Aug 18 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-20
- Updated 0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch to patchset 17 (rhbz#1130657)
- Bump Pacemaker to the latest version (rhbz#1120584)
-- Add 0001-Fixes-plugin.ini-error.patch (rhbz#1114739)
+- Add 0001-Fixes-plugin.ini-error.patch (rhbz#1114739)
* Wed Jul 30 2014 Iván Chavero <icahvero at redhat.com> - 2014.1-19.3
- Fixed sources upload
@@ -332,7 +337,7 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
* Wed Jul 30 2014 Iván Chavero <icahvero at redhat.com> - 2014.1-19
- Bump to the latest stable puppet modules
-- Removed puppetlabs-firewall-pull-request-367.patch
+- Removed puppetlabs-firewall-pull-request-367.patch
- Add puppetlabs-firewall-pull-request-367-2.patch
- Removed 0002-Refacfored-a-more-suitable-ovs_redhat-provider.patch
- Removed 0003-Fixes-bridge-addition-error-if-interface-has-no-IP.patch
diff --git a/sources b/sources
index 459c8fc..824b3e4 100644
--- a/sources
+++ b/sources
@@ -1,14 +1,13 @@
-575157496e3c7027df7be4d1f0f19eb9 xinetd-6b02de8d4f30a819eb404048e4258e3a5e8023c8.tar.gz
-390ce952e348614338df23de3d1d2974 apache-bbf9278b24931444022aa67140d3505b748151da.tar.gz
+7f8b4d8f9175173e2b4dd9b779d132c8 apache-769ff363a8a3c51e24f63a2494217d2d029289c6.tar.gz
720d47361dec959d7c82ec29d29eb8a2 ceilometer-c2f41fb1eb776bcfdaab79c120ac509a861d0828.tar.gz
35c3c53f442b591a4da3bfa75610069d certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
-31a83978552544766dfa14cb1dddcb80 cinder-57da044279780af66479c429e5803825a87b785e.tar.gz
+e3862e6c37d904e60f521b04d248c8f5 cinder-be74bc69283510c8a31bce71e153a2a152342683.tar.gz
6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz
-8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz
+d22e8a6680fa725598004b96486b9154 concat-07bba0bcad2e3a2baf19dbff8b1a5146d9141153.tar.gz
3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz
-4215c82a4f158d748023fde09d0c061f galera-3f63bd5ffdd707b42ef37a0ead3c2cf7e803586f.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
@@ -19,10 +18,11 @@ d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5c
25f400100566e0a10580b84835126631 mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz
9a74df5dd93d041d7f0095ca769294c9 mysql-8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f.tar.gz
54c813280d4333067f20a214b90293b8 neutron-d7ea12e36542204ed737d3514e2f05f2846fd330.tar.gz
-2f0d23068f0eb1916755787b1d7bb9ae nova-1e77a9d48a85a3ae6d30993b3c887f58e4a5973c.tar.gz
+0c2d1ad1dac1c27b6fe75a016a3052d7 nova-0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb.tar.gz
ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz
-625ce5ea3a37e0d1e4a0b1c09b6495ff puppet-07ec49d1f67a498b31b4f164678a76c464e129c4.tar.gz
+da027803b368c3790ad8421ce8c3a3ac pacemaker-0ed9ee8a29c0f27e86727d415b39d2715332df7d.tar.gz
+a108ddcf6b9e1c86564069f9fa8f0c47 puppet-bd467cae15eba9ca44274034d2593b0eaf30518d.tar.gz
0597e6eb94ca2cbbf3b22b4294e60dae qpid-1f0c32b39ad17e7acbd440b50fb6f0875971f5e1.tar.gz
a05c3e7ba8e2055a15901d1ddbd8cb79 rabbitmq-e7447851a60a419cd51a09ccf807964b36fdebac.tar.gz
b5d0c1c4cd711a3f762052813ad6a1bc rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
@@ -35,6 +35,5 @@ ed84fcfd855b066f6d74777d5d6b76cc sahara-f4e5681cfb289113be1ba49c12709145ecbad93
5905e569c1cff4429600d387e79de0f2 tempest-792be887b61ad9c38706e968a21752cfb05c2381.tar.gz
ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-d0808da5ad0ac1227a2d2d78ff66a9b1 vswitch-a20f6355f048d2cb6206222b2d045b41ac875db4.tar.gz
-da027803b368c3790ad8421ce8c3a3ac pacemaker-0ed9ee8a29c0f27e86727d415b39d2715332df7d.tar.gz
-6aaf62820b0c206be54c0a792bc58d5a galera-e35922bbb31ef2e6a86c7973cbafea96a8b160af.tar.gz
+1c25b1ac12a2fa3b2795de260381e925 vswitch-b7a15fc68c1c8e1e463c7d9e60a80f8c805fc11a.tar.gz
+575157496e3c7027df7be4d1f0f19eb9 xinetd-6b02de8d4f30a819eb404048e4258e3a5e8023c8.tar.gz
More information about the scm-commits
mailing list