[openstack-puppet-modules/icehouse-epel7] Updated to 2014.1-18
Martin Mágr
mmagr at fedoraproject.org
Thu Jun 26 14:47:03 UTC 2014
commit b8620227475ff81fdeb36b34aa3f6affe90df9bb
Author: Martin Magr <mmagr at redhat.com>
Date: Thu Jun 26 16:30:22 2014 +0200
Updated to 2014.1-18
0001-Refresh-Neutron-server.patch | 47 +++++++++++++++++++++++++++++++++++++
cinder-target-service.patch | 17 +++++++++++++
openstack-puppet-modules.spec | 29 ++++++++++++++++------
rabbitmq-repo-manage.patch | 26 ++++++++++++++++++++
sources | 2 +-
5 files changed, 112 insertions(+), 9 deletions(-)
---
diff --git a/0001-Refresh-Neutron-server.patch b/0001-Refresh-Neutron-server.patch
new file mode 100644
index 0000000..629fd4a
--- /dev/null
+++ b/0001-Refresh-Neutron-server.patch
@@ -0,0 +1,47 @@
+From 29071afcecf77aa30075cc361a724d843d8e97a9 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Wed, 18 Jun 2014 19:41:36 +0200
+Subject: [PATCH] Refresh Neutron server
+
+After ML2 configuration is changed Neutron server should be restarted.
+This patch adds appropriate notification.
+
+Change-Id: Ie838dacce8c553cf656333005d66b398c23f4bcc
+(cherry picked from commit b3203f698f66fd4422916808e4a55b0957c5aaa3)
+---
+ manifests/plugins/ml2.pp | 2 ++
+ spec/classes/neutron_plugins_ml2_spec.rb | 5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
+index cde5c7f..4f4d4d7 100644
+--- a/manifests/plugins/ml2.pp
++++ b/manifests/plugins/ml2.pp
+@@ -111,6 +111,8 @@ class neutron::plugins::ml2 (
+
+ include neutron::params
+
++ Neutron_plugin_ml2<||> ~> Service['neutron-server']
++
+ # test mechanism drivers
+ validate_array($mechanism_drivers)
+ if ! $mechanism_drivers {
+diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
+index 6829537..e297747 100644
+--- a/spec/classes/neutron_plugins_ml2_spec.rb
++++ b/spec/classes/neutron_plugins_ml2_spec.rb
+@@ -25,7 +25,10 @@ describe 'neutron::plugins::ml2' do
+ let :pre_condition do
+ "class { 'neutron':
+ rabbit_password => 'passw0rd',
+- core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
++ core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin' }
++
++ class { 'neutron::server':
++ auth_password => 'test'}"
+ end
+
+ let :default_params do
+--
+1.9.3
+
diff --git a/cinder-target-service.patch b/cinder-target-service.patch
new file mode 100644
index 0000000..412f712
--- /dev/null
+++ b/cinder-target-service.patch
@@ -0,0 +1,17 @@
+diff --git a/manifests/backend/iscsi.pp b/manifests/backend/iscsi.pp
+index cc6cb2e..86da186 100644
+--- a/manifests/backend/iscsi.pp
++++ b/manifests/backend/iscsi.pp
+@@ -49,6 +49,12 @@ define cinder::backend::iscsi (
+ }
+
+ 'lioadm': {
++ service { 'target':
++ ensure => running,
++ enable => true,
++ require => Package['targetcli'],
++ }
++
+ package { 'targetcli':
+ ensure => present,
+ name => $::cinder::params::lio_package_name,
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 98894fc..138e036 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -31,7 +31,7 @@
%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
%global stdlib_commit 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
-%global swift_commit e9b69499c943bfbb16c895611ebd4e90c16b377c
+%global swift_commit 80ec3a7576efad5e13d37a8c760ed0ad7f36055f
%global sysctl_commit c4486acc2d66de857dbccd8b4b945ea803226705
%global tempest_commit 792be887b61ad9c38706e968a21752cfb05c2381
%global vcsrepo_commit 6f7507a2a48ff0a58c7db026760a2eb84e382a77
@@ -42,7 +42,7 @@
Name: openstack-puppet-modules
Version: 2014.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -90,6 +90,7 @@ Source38: https://github.com/packstack/puppetlabs-xinetd/archive/%{xinetd_commit
# stable patches
Patch0: rdo-documentation.patch
+Patch1: rabbitmq-repo-manage.patch
# temporary patches
Patch100: compute_driver.patch
@@ -99,14 +100,14 @@ 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.patch
-Patch107: swift-restorecon.patch
Patch108: 0001-Implement-Keystone-domain-creation.patch
Patch109: 0001-Fixed-ovs-provider.patch
Patch110: 0002-Refacfored-a-more-suitable-ovs_redhat-provider.patch
Patch111: 0001-stop-puppet-from-breaking-neutron.patch
Patch112: 0001-Fixes-bridge-interface-name-check.patch
Patch113: 0003-Fixes-bridge-addition-error-if-interface-has-no-IP.patch
-
+Patch114: 0001-Refresh-Neutron-server.patch
+Patch115: cinder-target-service.patch
BuildArch: noarch
Requires: rubygem-json
@@ -180,13 +181,10 @@ cd %{_builddir}/%{name}-%{version}/puppetlabs-firewall-%{firewall_commit}
%patch105 -p1
%patch106 -p1
-# puppet-swift patches
-cd %{_builddir}/%{name}-%{version}/puppet-swift-%{swift_commit}
-%patch107 -p1
-
# puppet-neutron patches
cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch111 -p1
+%patch114 -p1
# puppet-vswitch patches
cd %{_builddir}/%{name}-%{version}/puppet-vswitch-%{vswitch_commit}
@@ -195,6 +193,14 @@ cd %{_builddir}/%{name}-%{version}/puppet-vswitch-%{vswitch_commit}
%patch112 -p1
%patch113 -p1
+# puppetlabs-rabbitmq patches
+cd %{_builddir}/%{name}-%{version}/puppetlabs-rabbitmq-%{rabbitmq_commit}
+%patch1 -p1
+
+# puppet-cinder patches
+cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit}
+%patch115 -p1
+
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
find %{_builddir}/%{name}-%{version}/ \( -name "*.pl" -o -name "*.sh" \) -exec chmod +x {} +
@@ -255,6 +261,13 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Jun 26 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-18
+- Updated modules to redhat-openstack/openstack-puppet-modules-2014.1-18
+- Added 0001-Refresh-Neutron-server.patch (rhbz#1110281)
+- Added rabbitmq-repo-manage.patch (rhbz#1112853)
+- Added cinder-target-service.patch
+- Removed swift-restorecon.patch
+
* Wed Jun 25 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-17
- Updated modules to redhat-openstack/openstack-puppet-modules-2014.1-17
- Added rdo-documentation.patch
diff --git a/rabbitmq-repo-manage.patch b/rabbitmq-repo-manage.patch
new file mode 100644
index 0000000..c9b2ec6
--- /dev/null
+++ b/rabbitmq-repo-manage.patch
@@ -0,0 +1,26 @@
+From 07a7e6a18aadd4fbd53b500595f89457f1dfa60b Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Wed, 25 Jun 2014 17:29:57 +0200
+Subject: [PATCH] Don't manage RabbitMQ repos
+
+Fixes: rhbz#1112853
+---
+ manifests/params.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/manifests/params.pp b/manifests/params.pp
+index 9018bb7..21ddeda 100644
+--- a/manifests/params.pp
++++ b/manifests/params.pp
+@@ -52,7 +52,7 @@ class rabbitmq::params {
+ $management_port = '15672'
+ $package_apt_pin = ''
+ $package_gpg_key = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc'
+- $manage_repos = true
++ $manage_repos = false
+ $service_ensure = 'running'
+ $service_manage = true
+ #config
+--
+1.9.3
+
diff --git a/sources b/sources
index 1e6ae7a..db7db4e 100644
--- a/sources
+++ b/sources
@@ -30,7 +30,7 @@ ed84fcfd855b066f6d74777d5d6b76cc sahara-f4e5681cfb289113be1ba49c12709145ecbad93
1a50e27c52661099d075556242a4a26e ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
387ad714db76de1e17b810b9db930f3f staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz
4e4a07838966a58f90eab3c5b8e4baea stdlib-62e8c1d76902e6f22cb9f7b3abd43e757b4130a3.tar.gz
-40e3880094154a236bbcaf84b8e894b0 swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz
+4e6d94b6a1b25ac1b284a023039e7556 swift-80ec3a7576efad5e13d37a8c760ed0ad7f36055f.tar.gz
9f332abf798b359d5f6d732a8b8fe95a sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
5905e569c1cff4429600d387e79de0f2 tempest-792be887b61ad9c38706e968a21752cfb05c2381.tar.gz
ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
More information about the scm-commits
mailing list