[openstack-puppet-modules/f21] Update to upstream 2014.1.1
Martin Mágr
mmagr at fedoraproject.org
Wed Nov 19 19:45:06 UTC 2014
commit 71e46111e8e070bf7e2841b52792af19a54b85ba
Author: Martin Mágr <mmagr at redhat.com>
Date: Wed Nov 19 14:19:12 2014 -0500
Update to upstream 2014.1.1
...-horizon-Change-default-documentation-URL.patch | 18 +-
...0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch | 19 +-
0003-nova-Change-default-compute-driver.patch | 24 ++
...his-patch-sets-default-charset-in-DB-to-u.patch | 30 ++-
...-Add-support-for-mac-address-source-rules.patch | 74 ++++
...Ensure-that-etc-sysconfig-iptables-exists.patch | 22 +-
...rrect-resource-dependencies-for-fedora-re.patch | 46 +++
...8-heat-Implement-Keystone-domain-creation.patch | 44 ++--
...neutron-Stop-puppet-from-breaking-neutron.patch | 37 +--
...manage-the-nova-uid-gid-if-nova_-user-gro.patch | 53 ++--
...tall-ceph-client-libraries-when-using-rbd.patch | 19 +-
...figure-OVS-mechanism-agent-configs-in-its.patch | 28 +-
...> 0013-horizon-Just-clean-original-config.patch | 19 +-
...ch => 0014-neutron-Fixes-plugin.ini-error.patch | 27 +-
...015-ceilometer-Add-manage_service-feature.patch | 123 ++++----
...h => 0016-heat-Add-manage_service-feature.patch | 43 ++--
...on-Add-manage_service-feature-for-horizon.patch | 45 ++--
... 0018-keystone-Add-manage_service-feature.patch | 21 +-
... => 0019-swift-Add-manage_service-feature.patch | 51 ++--
...=> 0020-glance-Add-manage_service-feature.patch | 31 +-
...0021-neutron-Fixed-manage_service-feature.patch | 19 +-
...2-nova-vlan-is-not-the-same-as-vlan_start.patch | 21 +-
...ew-manifest-file-to-deploy-Cisco-N1KV-VEM.patch | 59 ++--
...-Fixed-issue-with-vlan-on-redhat-provider.patch | 47 +++
compute_driver.patch | 13 -
openstack-puppet-modules.spec | 357 ++++++--------------
puppetlabs-firewall-pull-request-337.patch | 209 ------------
puppetlabs-firewall-pull-request-367-2.patch | 75 ----
sources | 41 +---
29 files changed, 640 insertions(+), 975 deletions(-)
---
diff --git a/rdo-documentation.patch b/0001-horizon-Change-default-documentation-URL.patch
similarity index 60%
rename from rdo-documentation.patch
rename to 0001-horizon-Change-default-documentation-URL.patch
index 38d9667..f043220 100644
--- a/rdo-documentation.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,19 +1,19 @@
-From 87721197918bb50682545c0c95a8a6b0b9c8b5d6 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Thu, 19 Jun 2014 12:49:20 +0200
-Subject: [PATCH] Change default documentation URL
+From 3291bcf705f7835ade7abbee8e46db1fda4e5dd9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 11:35:15 -0500
+Subject: [PATCH] [horizon] Change default documentation URL
Documentation should point to RDO docs by default. This patch is changing it.
Fixes: rhbz#1092019
---
- manifests/init.pp | 2 +-
+ horizon/manifests/init.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/manifests/init.pp b/manifests/init.pp
+diff --git a/horizon/manifests/init.pp b/horizon/manifests/init.pp
index aa3f823..640a964 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
+--- a/horizon/manifests/init.pp
++++ b/horizon/manifests/init.pp
@@ -185,7 +185,7 @@ class horizon(
$available_regions = undef,
$api_result_limit = 1000,
@@ -23,5 +23,3 @@ index aa3f823..640a964 100644
$local_settings_template = 'horizon/local_settings.py.erb',
$configure_apache = true,
$bind_address = undef,
---
-1.9.3
diff --git a/rabbitmq-repo-manage.patch b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
similarity index 55%
rename from rabbitmq-repo-manage.patch
rename to 0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
index c9b2ec6..0a1f282 100644
--- a/rabbitmq-repo-manage.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,17 +1,17 @@
-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
+From b709e4ba616a1ccf71ecb5bd545eb335d8c9c124 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 11:36:34 -0500
+Subject: [PATCH] [rabbitmq] Don't manage RabbitMQ repos
Fixes: rhbz#1112853
---
- manifests/params.pp | 2 +-
+ rabbitmq/manifests/params.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/manifests/params.pp b/manifests/params.pp
+diff --git a/rabbitmq/manifests/params.pp b/rabbitmq/manifests/params.pp
index 9018bb7..21ddeda 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
+--- a/rabbitmq/manifests/params.pp
++++ b/rabbitmq/manifests/params.pp
@@ -52,7 +52,7 @@ class rabbitmq::params {
$management_port = '15672'
$package_apt_pin = ''
@@ -21,6 +21,3 @@ index 9018bb7..21ddeda 100644
$service_ensure = 'running'
$service_manage = true
#config
---
-1.9.3
-
diff --git a/0003-nova-Change-default-compute-driver.patch b/0003-nova-Change-default-compute-driver.patch
new file mode 100644
index 0000000..74c56d5
--- /dev/null
+++ b/0003-nova-Change-default-compute-driver.patch
@@ -0,0 +1,24 @@
+From 31cec53c878e84285af5ec7b4136b28310f66076 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 11:39:05 -0500
+Subject: [PATCH] [nova] Change default compute/driver
+
+This patch is setting default DEFAULT/compute_driver in nova.conf
+to nova.virt.libvirt.LibvirtDriver
+---
+ nova/manifests/compute/libvirt.pp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nova/manifests/compute/libvirt.pp b/nova/manifests/compute/libvirt.pp
+index 5fd9f40..fe6ea33 100644
+--- a/nova/manifests/compute/libvirt.pp
++++ b/nova/manifests/compute/libvirt.pp
+@@ -141,7 +141,7 @@ class nova::compute::libvirt (
+ }
+
+ nova_config {
+- 'DEFAULT/compute_driver': value => 'libvirt.LibvirtDriver';
++ 'DEFAULT/compute_driver': value => 'nova.virt.libvirt.LibvirtDriver';
+ 'DEFAULT/vncserver_listen': value => $vncserver_listen;
+ 'libvirt/virt_type': value => $libvirt_virt_type_real;
+ 'libvirt/cpu_mode': value => $libvirt_cpu_mode_real;
diff --git a/openstack.patch b/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
similarity index 62%
rename from openstack.patch
rename to 0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
index 5d50bdb..4cf2085 100644
--- a/openstack.patch
+++ b/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
@@ -1,7 +1,19 @@
-diff --git a/manifests/all.pp b/manifests/all.pp
+From a131e424d84161fea9606f2726b71dd10dff1124 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 11:43:23 -0500
+Subject: [PATCH] [openstack] This patch sets default charset in DB to utf8 for
+ puppet-openstack
+
+---
+ openstack/manifests/all.pp | 2 +-
+ openstack/manifests/db/mysql.pp | 4 ++--
+ openstack/spec/classes/openstack_all_spec.rb | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/openstack/manifests/all.pp b/openstack/manifests/all.pp
index 8ce58b1..acbe1cb 100644
---- a/manifests/all.pp
-+++ b/manifests/all.pp
+--- a/openstack/manifests/all.pp
++++ b/openstack/manifests/all.pp
@@ -133,7 +133,7 @@ class openstack::all (
$mysql_account_security = true,
$mysql_bind_address = '0.0.0.0',
@@ -11,10 +23,10 @@ index 8ce58b1..acbe1cb 100644
# Keystone
$keystone_host = '127.0.0.1',
$keystone_db_user = 'keystone',
-diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
+diff --git a/openstack/manifests/db/mysql.pp b/openstack/manifests/db/mysql.pp
index 7a65607..4f212f7 100644
---- a/manifests/db/mysql.pp
-+++ b/manifests/db/mysql.pp
+--- a/openstack/manifests/db/mysql.pp
++++ b/openstack/manifests/db/mysql.pp
@@ -35,7 +35,7 @@
# [ceilometer_db_user]. Name of ceilometer DB user. Optional. Defaults to 'ceilometer'.
# [ceilometer_db_dbname]. Name of ceilometer DB. Optional. Defaults to 'ceilometer'.
@@ -33,10 +45,10 @@ index 7a65607..4f212f7 100644
$enabled = true
) {
-diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb
+diff --git a/openstack/spec/classes/openstack_all_spec.rb b/openstack/spec/classes/openstack_all_spec.rb
index 3890546..0b206e3 100644
---- a/spec/classes/openstack_all_spec.rb
-+++ b/spec/classes/openstack_all_spec.rb
+--- a/openstack/spec/classes/openstack_all_spec.rb
++++ b/openstack/spec/classes/openstack_all_spec.rb
@@ -295,7 +295,7 @@ describe 'openstack::all' do
it 'should have openstack::db::mysql configured' do
diff --git a/0005-firewall-Add-support-for-mac-address-source-rules.patch b/0005-firewall-Add-support-for-mac-address-source-rules.patch
new file mode 100644
index 0000000..69e3b37
--- /dev/null
+++ b/0005-firewall-Add-support-for-mac-address-source-rules.patch
@@ -0,0 +1,74 @@
+From c6cf81a235f9be2fd9bb61d55f56e91053f5d77f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 12:05:40 -0500
+Subject: [PATCH] [firewall] Add support for mac address source rules
+
+This is necessary to parse rules generated on OpenStack Havana + Neutron + OpenVSwitch
+
+From: Jeff '2 bits' Bachtel <jbachtel at bericotechnologies.com>
+From: Damian Szeluga <dszeluga at mirantis.com>
+---
+ firewall/lib/puppet/provider/firewall/iptables.rb | 3 ++-
+ firewall/lib/puppet/type/firewall.rb | 7 +++++++
+ firewall/spec/fixtures/iptables/conversion_hash.rb | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/firewall/lib/puppet/provider/firewall/iptables.rb b/firewall/lib/puppet/provider/firewall/iptables.rb
+index 698e731..f67cb21 100644
+--- a/firewall/lib/puppet/provider/firewall/iptables.rb
++++ b/firewall/lib/puppet/provider/firewall/iptables.rb
+@@ -58,6 +58,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
+ :limit => "-m limit --limit",
+ :log_level => "--log-level",
+ :log_prefix => "--log-prefix",
++ :mac_addr => ["-m mac --mac-source", "--mac-source"],
+ :name => "-m comment --comment",
+ :outiface => "-o",
+ :port => '-m multiport --ports',
+@@ -137,7 +138,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
+ # This order can be determined by going through iptables source code or just tweaking and trying manually
+ @resource_list = [
+ :table, :source, :destination, :iniface, :outiface, :proto, :isfragment,
+- :src_range, :dst_range, :tcp_flags, :gid, :uid, :sport, :dport, :port,
++ :src_range, :dst_range, :tcp_flags, :gid, :uid, :mac_addr, :sport, :dport, :port,
+ :dst_type, :src_type, :socket, :pkttype, :name, :ipsec_dir, :ipsec_policy,
+ :state, :ctstate, :icmp, :limit, :burst, :recent, :rseconds, :reap,
+ :rhitcount, :rttl, :rname, :rsource, :rdest, :jump, :todest, :tosource,
+diff --git a/firewall/lib/puppet/type/firewall.rb b/firewall/lib/puppet/type/firewall.rb
+index 75cf586..d3fb592 100644
+--- a/firewall/lib/puppet/type/firewall.rb
++++ b/firewall/lib/puppet/type/firewall.rb
+@@ -859,6 +859,13 @@ Puppet::Type.newtype(:firewall) do
+ Read-only property for caching the rule line.
+ EOS
+ end
++
++ newproperty(:mac_addr) do
++ desc <<-EOS
++ MAC Address
++ EOS
++ newvalues(/^([0-9a-f]{2}[:]){6}$/i)
++ end
+
+ autorequire(:firewallchain) do
+ reqs = []
+diff --git a/firewall/spec/fixtures/iptables/conversion_hash.rb b/firewall/spec/fixtures/iptables/conversion_hash.rb
+index 042e8bb..d50b1e8 100644
+--- a/firewall/spec/fixtures/iptables/conversion_hash.rb
++++ b/firewall/spec/fixtures/iptables/conversion_hash.rb
+@@ -6,6 +6,15 @@
+ # This hash is for testing a line conversion to a hash of parameters
+ # which will be used to create a resource.
+ ARGS_TO_HASH = {
++ 'mac_source_1' => {
++ :line => '-A neutron-openvswi-FORWARD -s 1.2.3.4/32 -m mac --mac-source FA:16:00:00:00:00 -j ACCEPT',
++ :table => 'filter',
++ :params => {
++ :chain => 'neutron-openvswi-FORWARD',
++ :source => '1.2.3.4/32',
++ :mac_addr => 'FA:16:00:00:00:00',
++ },
++ },
+ 'dport_and_sport' => {
+ :line => '-A nova-compute-FORWARD -s 0.0.0.0/32 -d 255.255.255.255/32 -p udp -m udp --sport 68 --dport 67 -j ACCEPT',
+ :table => 'filter',
diff --git a/puppetlabs-firewall-pull-request-365.patch b/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
similarity index 56%
rename from puppetlabs-firewall-pull-request-365.patch
rename to 0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
index e4b5fd7..e64497e 100644
--- a/puppetlabs-firewall-pull-request-365.patch
+++ b/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
@@ -1,7 +1,7 @@
-From 913c5f0999859b44641844cbebae872692390667 Mon Sep 17 00:00:00 2001
-From: Lars Kellogg-Stedman <lars at redhat.com>
-Date: Fri, 30 May 2014 13:22:52 -0400
-Subject: [PATCH 1/2] ensure that /etc/sysconfig/iptables exists
+From 6ac715987d33ca8cf5e0b3dd520bee1604f666cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:13:50 -0500
+Subject: [PATCH] [firewall] Ensure that /etc/sysconfig/iptables exists
The iptables service will not start if /etc/sysconfig/iptables is
missing. Attempting to start the service without this file will result
@@ -13,14 +13,14 @@ iptables start' returned 6:
This patch ensures the file exists before starting the iptables service.
---
- manifests/linux/redhat.pp | 8 ++++++++
+ firewall/manifests/linux/redhat.pp | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
-index f697d21..9226ac4 100644
---- a/manifests/linux/redhat.pp
-+++ b/manifests/linux/redhat.pp
-@@ -36,5 +36,13 @@
+diff --git a/firewall/manifests/linux/redhat.pp b/firewall/manifests/linux/redhat.pp
+index a4c00b6..d67cf1e 100644
+--- a/firewall/manifests/linux/redhat.pp
++++ b/firewall/manifests/linux/redhat.pp
+@@ -36,5 +36,13 @@ class firewall::linux::redhat (
ensure => $ensure,
enable => $enable,
hasstatus => true,
@@ -34,5 +34,3 @@ index f697d21..9226ac4 100644
+ mode => 0600,
}
}
---
-1.9.3
diff --git a/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch b/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
new file mode 100644
index 0000000..188cffe
--- /dev/null
+++ b/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
@@ -0,0 +1,46 @@
+From 5a3a28c09c8625ad9d58c34cacac2785af4f6a77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:24:11 -0500
+Subject: [PATCH] [firewall] Correct resource dependencies for fedora/redhat
+
+This patches makes Firewall resources depend upon the iptables-services
+package. Without this dependency, firewall rules will be instantiated
+in the running configuration but may not persist correctly because the
+necessary command is not (yet) available.
+
+This patches fixes the comparison issue with the new CentOS 7 version numbers.
+---
+ firewall/manifests/linux/redhat.pp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/firewall/manifests/linux/redhat.pp b/firewall/manifests/linux/redhat.pp
+index d67cf1e..a30961f 100644
+--- a/firewall/manifests/linux/redhat.pp
++++ b/firewall/manifests/linux/redhat.pp
+@@ -17,19 +17,25 @@ class firewall::linux::redhat (
+ $enable = true
+ ) {
+
++ $el_release = ['RedHat', 'CentOS']
++
+ # RHEL 7 and later and Fedora 15 and later require the iptables-services
+ # package, which provides the /usr/libexec/iptables/iptables.init used by
+ # lib/puppet/util/firewall.rb.
+- if $::operatingsystem == RedHat and $::operatingsystemrelease >= 7 {
++ if $::operatingsystem in $el_release and $::operatingsystemmajrelease >= 7 {
+ package { 'iptables-services':
+ ensure => present,
++ before => Service['iptables'],
+ }
++ Package['iptables-services'] -> Firewall <||>
+ }
+
+ if $::operatingsystem == Fedora and $::operatingsystemrelease >= 15 {
+ package { 'iptables-services':
+ ensure => present,
++ before => Service['iptables'],
+ }
++ Package['iptables-services'] -> Firewall <||>
+ }
+
+ service { 'iptables':
diff --git a/0001-Implement-Keystone-domain-creation.patch b/0008-heat-Implement-Keystone-domain-creation.patch
similarity index 86%
rename from 0001-Implement-Keystone-domain-creation.patch
rename to 0008-heat-Implement-Keystone-domain-creation.patch
index 91aec16..d116353 100644
--- a/0001-Implement-Keystone-domain-creation.patch
+++ b/0008-heat-Implement-Keystone-domain-creation.patch
@@ -1,7 +1,7 @@
-From 3a38aa6eda5a57299f20bf0cabb10442e1a2cc89 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Thu, 5 Jun 2014 14:24:47 +0200
-Subject: [PATCH] Implement Keystone domain creation
+From 7de8fd63b9fc6258d269a6059ddf1b6502ba6e9f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:29:38 -0500
+Subject: [PATCH] [heat] Implement Keystone domain creation
Keystone domain has to be created for Heat. This patch implements this
via helper script [1] since we don't have support for Keystone v3 API
@@ -12,20 +12,20 @@ please check [2].
[1] https://github.com/openstack/heat/blob/master/bin/heat-keystone-setup-domain
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1076172
---
- lib/puppet/provider/heat_domain_id_setter/ruby.rb | 183 ++++++++++++++++++++++
- lib/puppet/type/heat_config.rb | 4 +
- lib/puppet/type/heat_domain_id_setter.rb | 31 ++++
- manifests/keystone/domain.pp | 73 +++++++++
+ .../puppet/provider/heat_domain_id_setter/ruby.rb | 183 +++++++++++++++++++++
+ heat/lib/puppet/type/heat_config.rb | 4 +
+ heat/lib/puppet/type/heat_domain_id_setter.rb | 31 ++++
+ heat/manifests/keystone/domain.pp | 73 ++++++++
4 files changed, 291 insertions(+)
- create mode 100644 lib/puppet/provider/heat_domain_id_setter/ruby.rb
- create mode 100644 lib/puppet/type/heat_domain_id_setter.rb
- create mode 100644 manifests/keystone/domain.pp
+ create mode 100644 heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
+ create mode 100644 heat/lib/puppet/type/heat_domain_id_setter.rb
+ create mode 100644 heat/manifests/keystone/domain.pp
-diff --git a/lib/puppet/provider/heat_domain_id_setter/ruby.rb b/lib/puppet/provider/heat_domain_id_setter/ruby.rb
+diff --git a/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb b/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
new file mode 100644
index 0000000..8862fe5
--- /dev/null
-+++ b/lib/puppet/provider/heat_domain_id_setter/ruby.rb
++++ b/heat/lib/puppet/provider/heat_domain_id_setter/ruby.rb
@@ -0,0 +1,183 @@
+## NB: This must work with Ruby 1.8!
+
@@ -210,10 +210,10 @@ index 0000000..8862fe5
+ end
+
+end
-diff --git a/lib/puppet/type/heat_config.rb b/lib/puppet/type/heat_config.rb
+diff --git a/heat/lib/puppet/type/heat_config.rb b/heat/lib/puppet/type/heat_config.rb
index 3534e22..131cfad 100644
---- a/lib/puppet/type/heat_config.rb
-+++ b/lib/puppet/type/heat_config.rb
+--- a/heat/lib/puppet/type/heat_config.rb
++++ b/heat/lib/puppet/type/heat_config.rb
@@ -16,4 +16,8 @@ Puppet::Type.newtype(:heat_config) do
end
end
@@ -223,11 +223,11 @@ index 3534e22..131cfad 100644
+ end
+
end
-diff --git a/lib/puppet/type/heat_domain_id_setter.rb b/lib/puppet/type/heat_domain_id_setter.rb
+diff --git a/heat/lib/puppet/type/heat_domain_id_setter.rb b/heat/lib/puppet/type/heat_domain_id_setter.rb
new file mode 100644
index 0000000..d6e1eee
--- /dev/null
-+++ b/lib/puppet/type/heat_domain_id_setter.rb
++++ b/heat/lib/puppet/type/heat_domain_id_setter.rb
@@ -0,0 +1,31 @@
+Puppet::Type.newtype(:heat_domain_id_setter) do
+
@@ -260,11 +260,11 @@ index 0000000..d6e1eee
+ defaultto 'admin'
+ end
+end
-diff --git a/manifests/keystone/domain.pp b/manifests/keystone/domain.pp
+diff --git a/heat/manifests/keystone/domain.pp b/heat/manifests/keystone/domain.pp
new file mode 100644
-index 0000000..0ef4b6a
+index 0000000..5cb98b7
--- /dev/null
-+++ b/manifests/keystone/domain.pp
++++ b/heat/manifests/keystone/domain.pp
@@ -0,0 +1,73 @@
+# == Class: heat::keystone::domain
+#
@@ -339,5 +339,3 @@ index 0000000..0ef4b6a
+ }
+
+}
---
-1.9.3
diff --git a/0001-stop-puppet-from-breaking-neutron.patch b/0009-neutron-Stop-puppet-from-breaking-neutron.patch
similarity index 57%
rename from 0001-stop-puppet-from-breaking-neutron.patch
rename to 0009-neutron-Stop-puppet-from-breaking-neutron.patch
index 300f9fd..9c3303c 100644
--- a/0001-stop-puppet-from-breaking-neutron.patch
+++ b/0009-neutron-Stop-puppet-from-breaking-neutron.patch
@@ -1,7 +1,7 @@
-From 5d953a42b5f8a3a52bb894e4289b0d557c047a8a Mon Sep 17 00:00:00 2001
-From: Lars Kellogg-Stedman <lars at redhat.com>
-Date: Fri, 13 Jun 2014 21:32:20 -0400
-Subject: [PATCH] stop puppet from breaking neutron
+From 76cf317d154f6d5ef596f4591c5c6af6b3ca675b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:33:03 -0500
+Subject: [PATCH] [neutron] Stop puppet from breaking neutron
The neutron-ovs-cleanup service is meant to run at boot to tear down ovs
interfaces created by Neutron. The service runs and then exits, which
@@ -14,18 +14,16 @@ completely disable Neutron networking.
This patch removes the `ensure` setting, such that the service will be
enabled and will run at boot but will not be erroneously started by
Puppet.
-
-Change-Id: I5445fcd05f7cf5c48ded209a2895ea7d8732f40f
---
- manifests/agents/ovs.pp | 1 -
- spec/classes/neutron_agents_ovs_spec.rb | 3 +--
+ neutron/manifests/agents/ovs.pp | 1 -
+ neutron/spec/classes/neutron_agents_ovs_spec.rb | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
-index 289f67f..978c68e 100644
---- a/manifests/agents/ovs.pp
-+++ b/manifests/agents/ovs.pp
-@@ -144,7 +144,6 @@ class neutron::agents::ovs (
+diff --git a/neutron/manifests/agents/ovs.pp b/neutron/manifests/agents/ovs.pp
+index 30b40c5..0b4401a 100644
+--- a/neutron/manifests/agents/ovs.pp
++++ b/neutron/manifests/agents/ovs.pp
+@@ -145,7 +145,6 @@ class neutron::agents::ovs (
}
if $::neutron::params::ovs_cleanup_service {
service {'ovs-cleanup-service':
@@ -33,11 +31,11 @@ index 289f67f..978c68e 100644
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
}
-diff --git a/spec/classes/neutron_agents_ovs_spec.rb b/spec/classes/neutron_agents_ovs_spec.rb
-index 9c1c581..b827baa 100644
---- a/spec/classes/neutron_agents_ovs_spec.rb
-+++ b/spec/classes/neutron_agents_ovs_spec.rb
-@@ -185,8 +185,7 @@ describe 'neutron::agents::ovs' do
+diff --git a/neutron/spec/classes/neutron_agents_ovs_spec.rb b/neutron/spec/classes/neutron_agents_ovs_spec.rb
+index 1d233bb..44d9e77 100644
+--- a/neutron/spec/classes/neutron_agents_ovs_spec.rb
++++ b/neutron/spec/classes/neutron_agents_ovs_spec.rb
+@@ -198,8 +198,7 @@ describe 'neutron::agents::ovs' do
it 'configures neutron ovs cleanup service' do
should contain_service('ovs-cleanup-service').with(
:name => platform_params[:ovs_cleanup_service],
@@ -47,6 +45,3 @@ index 9c1c581..b827baa 100644
)
should contain_package('neutron-plugin-ovs').with_before(/Service\[ovs-cleanup-service\]/)
end
---
-1.9.3
-
diff --git a/0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch b/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
similarity index 82%
rename from 0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch
rename to 0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
index 487f0f7..5bfe8df 100644
--- a/0001-Don-t-manage-the-nova-uid-gid-if-nova_-user-group-_i.patch
+++ b/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
@@ -1,8 +1,8 @@
-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
+From 7ba76398e21a6b3f31d4b83f73ae49e3705d30bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:35:56 -0500
+Subject: [PATCH] [nova] 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
@@ -18,17 +18,17 @@ 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 ++++-----
+ nova/manifests/compute/libvirt.pp | 2 +-
+ nova/manifests/consoleauth.pp | 2 +-
+ nova/manifests/init.pp | 51 ++++++++++++++++++++++++-------------
+ nova/manifests/objectstore.pp | 2 +-
+ nova/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
+diff --git a/nova/manifests/compute/libvirt.pp b/nova/manifests/compute/libvirt.pp
index fe6ea33..a0a1712 100644
---- a/manifests/compute/libvirt.pp
-+++ b/manifests/compute/libvirt.pp
+--- a/nova/manifests/compute/libvirt.pp
++++ b/nova/manifests/compute/libvirt.pp
@@ -105,7 +105,7 @@ class nova::compute::libvirt (
package { "nova-compute-${libvirt_virt_type_real}":
ensure => present,
@@ -38,10 +38,10 @@ index fe6ea33..a0a1712 100644
}
}
-diff --git a/manifests/consoleauth.pp b/manifests/consoleauth.pp
+diff --git a/nova/manifests/consoleauth.pp b/nova/manifests/consoleauth.pp
index 953e712..4813b36 100644
---- a/manifests/consoleauth.pp
-+++ b/manifests/consoleauth.pp
+--- a/nova/manifests/consoleauth.pp
++++ b/nova/manifests/consoleauth.pp
@@ -33,7 +33,7 @@ class nova::consoleauth(
package_name => $::nova::params::consoleauth_package_name,
service_name => $::nova::params::consoleauth_service_name,
@@ -51,10 +51,10 @@ index 953e712..4813b36 100644
}
}
-diff --git a/manifests/init.pp b/manifests/init.pp
+diff --git a/nova/manifests/init.pp b/nova/manifests/init.pp
index 3202db0..3e9ecd1 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
+--- a/nova/manifests/init.pp
++++ b/nova/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,
@@ -134,10 +134,10 @@ index 3202db0..3e9ecd1 100644
}
file { '/etc/nova/nova.conf':
-diff --git a/manifests/objectstore.pp b/manifests/objectstore.pp
+diff --git a/nova/manifests/objectstore.pp b/nova/manifests/objectstore.pp
index d8b6359..466be81 100644
---- a/manifests/objectstore.pp
-+++ b/manifests/objectstore.pp
+--- a/nova/manifests/objectstore.pp
++++ b/nova/manifests/objectstore.pp
@@ -35,7 +35,7 @@ class nova::objectstore(
package_name => $::nova::params::objectstore_package_name,
service_name => $::nova::params::objectstore_service_name,
@@ -147,10 +147,10 @@ index d8b6359..466be81 100644
}
nova_config {
-diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
+diff --git a/nova/spec/classes/nova_init_spec.rb b/nova/spec/classes/nova_init_spec.rb
index c66b04b..9729d00 100644
---- a/spec/classes/nova_init_spec.rb
-+++ b/spec/classes/nova_init_spec.rb
+--- a/nova/spec/classes/nova_init_spec.rb
++++ b/nova/spec/classes/nova_init_spec.rb
@@ -22,13 +22,13 @@ describe 'nova' do
)
end
@@ -187,6 +187,3 @@ index c66b04b..9729d00 100644
)
end
---
-1.9.3
-
diff --git a/0001-Install-ceph-client-libraries-when-using-rbd.patch b/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
similarity index 63%
rename from 0001-Install-ceph-client-libraries-when-using-rbd.patch
rename to 0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
index 0a4bb18..6405185 100644
--- a/0001-Install-ceph-client-libraries-when-using-rbd.patch
+++ b/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
@@ -1,20 +1,20 @@
-From e523b5d1f2d56fa0e708371879cca659c592fbd4 Mon Sep 17 00:00:00 2001
-From: Ivan Chavero <ichavero at redhat.com>
-Date: Tue, 8 Jul 2014 21:51:04 -0600
-Subject: [PATCH] Install ceph client libraries when using rbd
+From 684a1a59f483550ed85705c290dcf92882254e12 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:37:34 -0500
+Subject: [PATCH] [nova] Install ceph client libraries when using rbd
Ceph client libraries might not be installed when using the
nova::compute::rbd class.
Change-Id: Icc2c8e688abbc6d8a1877bfea7be6b30204d1a52
---
- manifests/compute/rbd.pp | 14 ++++++++++++++
+ nova/manifests/compute/rbd.pp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
-diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
+diff --git a/nova/manifests/compute/rbd.pp b/nova/manifests/compute/rbd.pp
index 009833d..e65d0cd 100644
---- a/manifests/compute/rbd.pp
-+++ b/manifests/compute/rbd.pp
+--- a/nova/manifests/compute/rbd.pp
++++ b/nova/manifests/compute/rbd.pp
@@ -53,6 +53,20 @@ class nova::compute::rbd (
include nova::params
@@ -36,6 +36,3 @@ index 009833d..e65d0cd 100644
nova_config {
'libvirt/images_type': value => 'rbd';
'libvirt/images_rbd_pool': value => $libvirt_images_rbd_pool;
---
-1.9.3
-
diff --git a/0001-Configure-OVS-mechanism-agent-configs-in-its-config-.patch b/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
similarity index 93%
rename from 0001-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
rename to 0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
index 86b1edc..1a62901 100644
--- a/0001-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
+++ b/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
@@ -1,7 +1,8 @@
-From f5fd94991b271dd38f336d968b7713453cf3933e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne at iweb.com>
-Date: Wed, 9 Jul 2014 20:44:07 -0400
-Subject: [PATCH] Configure OVS mechanism agent configs in its config file
+From 150d05207d43bec6ed762fe08af0ef87f16878fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:40:41 -0500
+Subject: [PATCH] [neutron] Configure OVS mechanism agent configs in its config
+ file
Configurations for the OVS agent should go in its config file:
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -17,14 +18,14 @@ in neutron-server, not the agents themselves.
Change-Id: I53d9b923784587e8a2a934f004a3b054c716daaa
---
- manifests/agents/ml2/ovs.pp | 39 ++++++-----------
- spec/classes/neutron_agents_ml2_ovs_spec.rb | 66 ++++++++++++-----------------
+ neutron/manifests/agents/ml2/ovs.pp | 39 +++++--------
+ .../spec/classes/neutron_agents_ml2_ovs_spec.rb | 66 +++++++++-------------
2 files changed, 40 insertions(+), 65 deletions(-)
-diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
+diff --git a/neutron/manifests/agents/ml2/ovs.pp b/neutron/manifests/agents/ml2/ovs.pp
index 34c1ddb..c999880 100644
---- a/manifests/agents/ml2/ovs.pp
-+++ b/manifests/agents/ml2/ovs.pp
+--- a/neutron/manifests/agents/ml2/ovs.pp
++++ b/neutron/manifests/agents/ml2/ovs.pp
@@ -107,7 +107,8 @@ class neutron::agents::ml2::ovs (
fail('Local ip for ovs agent must be set when tunneling is enabled')
}
@@ -139,10 +140,10 @@ index 34c1ddb..c999880 100644
ensure => $service_ensure,
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
-diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb
+diff --git a/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb b/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
index a4e9f77..26d4812 100644
---- a/spec/classes/neutron_agents_ml2_ovs_spec.rb
-+++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb
+--- a/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
++++ b/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
@@ -33,15 +33,15 @@ describe 'neutron::agents::ml2::ovs' do
it { should contain_class('neutron::params') }
@@ -269,6 +270,3 @@ index a4e9f77..26d4812 100644
- end
end
end
---
-1.8.3.1
-
diff --git a/0001-Just-clean-original-config.patch b/0013-horizon-Just-clean-original-config.patch
similarity index 86%
rename from 0001-Just-clean-original-config.patch
rename to 0013-horizon-Just-clean-original-config.patch
index b39d24a..0a53e2b 100644
--- a/0001-Just-clean-original-config.patch
+++ b/0013-horizon-Just-clean-original-config.patch
@@ -1,7 +1,7 @@
-From b532556f54e50dec03a4cfb811dcc6d00c62a3f4 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Wed, 23 Jul 2014 11:59:36 +0200
-Subject: [PATCH] Just clean original config
+From 8c7b6ba3678e9ac9f8c69a35082cedd8bafb7e00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:42:47 -0500
+Subject: [PATCH] [horizon] Just clean original config
Original config file should not be deleted but only cleaned,
so that it is not recreated during package update.
@@ -10,13 +10,13 @@ Change-Id: I8ead90fd92c20dc7ebeadbb9134a6c21a52d3481
Closes-Bug: 1347533
Closes-Bug: rhbz#1122192
---
- manifests/wsgi/apache.pp | 41 ++++++++++++++++++++++++-----------------
+ horizon/manifests/wsgi/apache.pp | 41 +++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
-diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
+diff --git a/horizon/manifests/wsgi/apache.pp b/horizon/manifests/wsgi/apache.pp
index e641cd1..dd96ce0 100644
---- a/manifests/wsgi/apache.pp
-+++ b/manifests/wsgi/apache.pp
+--- a/horizon/manifests/wsgi/apache.pp
++++ b/horizon/manifests/wsgi/apache.pp
@@ -35,18 +35,20 @@
# (optional) A hash of extra paramaters for apache::wsgi class.
# Defaults to {}
@@ -85,6 +85,3 @@ index e641cd1..dd96ce0 100644
ssl => true,
port => 443,
ensure => $ensure_ssl_vhost,
---
-1.8.3.1
-
diff --git a/0001-Fixes-plugin.ini-error.patch b/0014-neutron-Fixes-plugin.ini-error.patch
similarity index 66%
rename from 0001-Fixes-plugin.ini-error.patch
rename to 0014-neutron-Fixes-plugin.ini-error.patch
index b646b56..c8ff110 100644
--- a/0001-Fixes-plugin.ini-error.patch
+++ b/0014-neutron-Fixes-plugin.ini-error.patch
@@ -1,7 +1,7 @@
-From fca2d38b51ec8acbb93a58748d245793c1010913 Mon Sep 17 00:00:00 2001
-From: Ivan Chavero <ichavero at redhat.com>
-Date: Mon, 4 Aug 2014 13:46:21 -0600
-Subject: [PATCH] Fixes plugin.ini error
+From 7a423fe59b5c450f8fdb9678c5807ddf201ad4f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:45:04 -0500
+Subject: [PATCH] [neutron] Fixes plugin.ini error
When executing the cisco.pp manifest it throws an error
if the plugin.ini file is already declared.
@@ -11,14 +11,14 @@ is needed for icehouse.
Change-Id: I9b8efe668911013d4fd801def15d0c4c384e42ca
---
- manifests/plugins/cisco.pp | 14 +++++++++-----
- spec/classes/neutron_plugins_cisco_spec.rb | 3 +--
+ neutron/manifests/plugins/cisco.pp | 14 +++++++++-----
+ neutron/spec/classes/neutron_plugins_cisco_spec.rb | 3 +--
2 files changed, 10 insertions(+), 7 deletions(-)
-diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp
+diff --git a/neutron/manifests/plugins/cisco.pp b/neutron/manifests/plugins/cisco.pp
index 54ceda5..db19096 100644
---- a/manifests/plugins/cisco.pp
-+++ b/manifests/plugins/cisco.pp
+--- a/neutron/manifests/plugins/cisco.pp
++++ b/neutron/manifests/plugins/cisco.pp
@@ -171,9 +171,13 @@ class neutron::plugins::cisco(
# In RH, this link is used to start Neutron process but in Debian, it's used only
@@ -38,10 +38,10 @@ index 54ceda5..db19096 100644
+ }
+ }
}
-diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb
+diff --git a/neutron/spec/classes/neutron_plugins_cisco_spec.rb b/neutron/spec/classes/neutron_plugins_cisco_spec.rb
index 2438342..d56e31f 100644
---- a/spec/classes/neutron_plugins_cisco_spec.rb
-+++ b/spec/classes/neutron_plugins_cisco_spec.rb
+--- a/neutron/spec/classes/neutron_plugins_cisco_spec.rb
++++ b/neutron/spec/classes/neutron_plugins_cisco_spec.rb
@@ -42,8 +42,7 @@ describe 'neutron::plugins::cisco' do
it 'should create plugin symbolic link' do
should contain_file('/etc/neutron/plugin.ini').with(
@@ -52,6 +52,3 @@ index 2438342..d56e31f 100644
)
end
---
-1.9.3
-
diff --git a/manage_service-ceilometer.patch b/0015-ceilometer-Add-manage_service-feature.patch
similarity index 86%
rename from manage_service-ceilometer.patch
rename to 0015-ceilometer-Add-manage_service-feature.patch
index 821710e..aebfc0c 100644
--- a/manage_service-ceilometer.patch
+++ b/0015-ceilometer-Add-manage_service-feature.patch
@@ -1,7 +1,7 @@
-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
+From fa673e67193fa937b57cf675b160d0f39ddb01a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:49:47 -0500
+Subject: [PATCH] [ceilometer] Add manage_service feature
puppet-ceilometer lacks of disabling service managing. This patch adds
$manage_service parameter to all relevant classes.
@@ -9,26 +9,26 @@ $manage_service parameter to all relevant classes.
Closes-bug: #1359823
Change-Id: Iee545b46ef5d7cf92859356ae84b8103564bf047
---
- 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 ++++++++++
+ ceilometer/manifests/agent/central.pp | 20 +++++---
+ ceilometer/manifests/agent/compute.pp | 21 +++++---
+ ceilometer/manifests/agent/notification.pp | 20 +++++---
+ ceilometer/manifests/alarm/evaluator.pp | 36 ++++++++++----
+ ceilometer/manifests/alarm/notifier.pp | 35 +++++++++----
+ ceilometer/manifests/api.pp | 57 ++++++++++++++--------
+ ceilometer/manifests/collector.pp | 24 ++++++---
+ .../spec/classes/ceilometer_agent_central_spec.rb | 45 +++++++++++++----
+ .../spec/classes/ceilometer_agent_compute_spec.rb | 50 ++++++++++++++-----
+ .../classes/ceilometer_agent_notification_spec.rb | 50 ++++++++++++++-----
+ .../classes/ceilometer_alarm_evaluator_spec.rb | 56 +++++++++++++++------
+ .../spec/classes/ceilometer_alarm_notifier_spec.rb | 48 +++++++++++++-----
+ ceilometer/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
+diff --git a/ceilometer/manifests/agent/central.pp b/ceilometer/manifests/agent/central.pp
index 0a07856..7c17d8c 100644
---- a/manifests/agent/central.pp
-+++ b/manifests/agent/central.pp
+--- a/ceilometer/manifests/agent/central.pp
++++ b/ceilometer/manifests/agent/central.pp
@@ -2,10 +2,16 @@
#
# == Parameters
@@ -65,10 +65,10 @@ index 0a07856..7c17d8c 100644
}
Package['ceilometer-common'] -> Service['ceilometer-agent-central']
-diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
+diff --git a/ceilometer/manifests/agent/compute.pp b/ceilometer/manifests/agent/compute.pp
index fde3705..9a81e8c 100644
---- a/manifests/agent/compute.pp
-+++ b/manifests/agent/compute.pp
+--- a/ceilometer/manifests/agent/compute.pp
++++ b/ceilometer/manifests/agent/compute.pp
@@ -3,11 +3,16 @@
#
# == Parameters
@@ -106,10 +106,10 @@ index fde3705..9a81e8c 100644
}
Package['ceilometer-common'] -> Service['ceilometer-agent-compute']
-diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
+diff --git a/ceilometer/manifests/agent/notification.pp b/ceilometer/manifests/agent/notification.pp
index 2999362..f8c2631 100644
---- a/manifests/agent/notification.pp
-+++ b/manifests/agent/notification.pp
+--- a/ceilometer/manifests/agent/notification.pp
++++ b/ceilometer/manifests/agent/notification.pp
@@ -23,10 +23,13 @@
# file with the OVS plugin if both are on the same machine.
#
@@ -152,10 +152,10 @@ index 2999362..f8c2631 100644
}
Package['ceilometer-common'] -> Service['ceilometer-agent-notification']
-diff --git a/manifests/alarm/evaluator.pp b/manifests/alarm/evaluator.pp
+diff --git a/ceilometer/manifests/alarm/evaluator.pp b/ceilometer/manifests/alarm/evaluator.pp
index 2621534..2b9ca64 100644
---- a/manifests/alarm/evaluator.pp
-+++ b/manifests/alarm/evaluator.pp
+--- a/ceilometer/manifests/alarm/evaluator.pp
++++ b/ceilometer/manifests/alarm/evaluator.pp
@@ -2,18 +2,32 @@
#
# == Params
@@ -212,10 +212,10 @@ index 2621534..2b9ca64 100644
}
Package['ceilometer-common'] -> Service['ceilometer-alarm-evaluator']
-diff --git a/manifests/alarm/notifier.pp b/manifests/alarm/notifier.pp
+diff --git a/ceilometer/manifests/alarm/notifier.pp b/ceilometer/manifests/alarm/notifier.pp
index 1b09baa..4bad221 100644
---- a/manifests/alarm/notifier.pp
-+++ b/manifests/alarm/notifier.pp
+--- a/ceilometer/manifests/alarm/notifier.pp
++++ b/ceilometer/manifests/alarm/notifier.pp
@@ -2,18 +2,31 @@
#
# == Params
@@ -271,10 +271,10 @@ index 1b09baa..4bad221 100644
}
Package['ceilometer-common'] -> Service['ceilometer-alarm-notifier']
-diff --git a/manifests/api.pp b/manifests/api.pp
+diff --git a/ceilometer/manifests/api.pp b/ceilometer/manifests/api.pp
index 92406a8..3ef9ba2 100644
---- a/manifests/api.pp
-+++ b/manifests/api.pp
+--- a/ceilometer/manifests/api.pp
++++ b/ceilometer/manifests/api.pp
@@ -2,41 +2,54 @@
#
# == Parameters
@@ -364,10 +364,10 @@ index 92406a8..3ef9ba2 100644
}
Package['ceilometer-common'] -> Service['ceilometer-api']
-diff --git a/manifests/collector.pp b/manifests/collector.pp
+diff --git a/ceilometer/manifests/collector.pp b/ceilometer/manifests/collector.pp
index 2506efb..8e1f6fc 100644
---- a/manifests/collector.pp
-+++ b/manifests/collector.pp
+--- a/ceilometer/manifests/collector.pp
++++ b/ceilometer/manifests/collector.pp
@@ -2,10 +2,16 @@
#
# == Params
@@ -408,10 +408,10 @@ index 2506efb..8e1f6fc 100644
}
Package['ceilometer-common'] -> Service['ceilometer-collector']
-diff --git a/spec/classes/ceilometer_agent_central_spec.rb b/spec/classes/ceilometer_agent_central_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_agent_central_spec.rb b/ceilometer/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
+--- a/ceilometer/spec/classes/ceilometer_agent_central_spec.rb
++++ b/ceilometer/spec/classes/ceilometer_agent_central_spec.rb
@@ -7,7 +7,8 @@ describe 'ceilometer::agent::central' do
end
@@ -471,10 +471,10 @@ index 5fab4c9..8a45c35 100644
end
end
-diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_agent_compute_spec.rb b/ceilometer/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
+--- a/ceilometer/spec/classes/ceilometer_agent_compute_spec.rb
++++ b/ceilometer/spec/classes/ceilometer_agent_compute_spec.rb
@@ -9,7 +9,8 @@ describe 'ceilometer::agent::compute' do
end
@@ -546,10 +546,10 @@ index 16f19a0..d193bc1 100644
end
context 'on Debian platforms' do
-diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_agent_notification_spec.rb b/ceilometer/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
+--- a/ceilometer/spec/classes/ceilometer_agent_notification_spec.rb
++++ b/ceilometer/spec/classes/ceilometer_agent_notification_spec.rb
@@ -27,7 +27,9 @@ describe 'ceilometer::agent::notification' do
end
@@ -619,10 +619,10 @@ index a7ad76e..ed9c252 100644
end
context 'on Debian platforms' do
-diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_alarm_evaluator_spec.rb b/ceilometer/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
+--- a/ceilometer/spec/classes/ceilometer_alarm_evaluator_spec.rb
++++ b/ceilometer/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,
@@ -704,10 +704,10 @@ index d017695..b2c4c48 100644
end
context 'on Debian platforms' do
-diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_alarm_notifier_spec.rb b/ceilometer/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
+--- a/ceilometer/spec/classes/ceilometer_alarm_notifier_spec.rb
++++ b/ceilometer/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,
@@ -777,10 +777,10 @@ index 6c40d43..d4e65a1 100644
end
context 'on Debian platforms' do
-diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_api_spec.rb b/ceilometer/spec/classes/ceilometer_api_spec.rb
index 546f92f..924ed15 100644
---- a/spec/classes/ceilometer_api_spec.rb
-+++ b/spec/classes/ceilometer_api_spec.rb
+--- a/ceilometer/spec/classes/ceilometer_api_spec.rb
++++ b/ceilometer/spec/classes/ceilometer_api_spec.rb
@@ -8,6 +8,7 @@ describe 'ceilometer::api' do
let :params do
@@ -853,10 +853,10 @@ index 546f92f..924ed15 100644
end
context 'on Debian platforms' do
-diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
+diff --git a/ceilometer/spec/classes/ceilometer_collector_spec.rb b/ceilometer/spec/classes/ceilometer_collector_spec.rb
index 25e6d65..72f2510 100644
---- a/spec/classes/ceilometer_collector_spec.rb
-+++ b/spec/classes/ceilometer_collector_spec.rb
+--- a/ceilometer/spec/classes/ceilometer_collector_spec.rb
++++ b/ceilometer/spec/classes/ceilometer_collector_spec.rb
@@ -42,6 +42,33 @@ describe 'ceilometer::collector' do
# Catalog compilation does not crash for lack of ceilometer::db
@@ -891,6 +891,3 @@ index 25e6d65..72f2510 100644
end
end
---
-1.9.3
-
diff --git a/manage_service-heat.patch b/0016-heat-Add-manage_service-feature.patch
similarity index 75%
rename from manage_service-heat.patch
rename to 0016-heat-Add-manage_service-feature.patch
index 230357c..878f6ed 100644
--- a/manage_service-heat.patch
+++ b/0016-heat-Add-manage_service-feature.patch
@@ -1,7 +1,7 @@
-From 2b5669f84bbcee825807c421b5a1fc007c45c121 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Wed, 20 Aug 2014 18:03:45 +0200
-Subject: [PATCH] Add manage_service feature
+From 641f88ac6ff44359378043e5e7dc7f0070dcf78b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:50:53 -0500
+Subject: [PATCH] [heat] Add manage_service feature
puppet-heat lacks of disabling service managing. This patch adds
$manage_service parameter to all relevant classes.
@@ -9,16 +9,16 @@ $manage_service parameter to all relevant classes.
Closes-bug: #1359823
Change-Id: I54245b39f3484ccdb9910aa0fa4c8dc2bae3f0ce
---
- manifests/api.pp | 11 +++++++----
- manifests/api_cfn.pp | 11 +++++++----
- manifests/api_cloudwatch.pp | 12 ++++++++----
- manifests/engine.pp | 11 +++++++----
+ heat/manifests/api.pp | 11 +++++++----
+ heat/manifests/api_cfn.pp | 11 +++++++----
+ heat/manifests/api_cloudwatch.pp | 12 ++++++++----
+ heat/manifests/engine.pp | 11 +++++++----
4 files changed, 29 insertions(+), 16 deletions(-)
-diff --git a/manifests/api.pp b/manifests/api.pp
+diff --git a/heat/manifests/api.pp b/heat/manifests/api.pp
index ef4e454..9e418a1 100644
---- a/manifests/api.pp
-+++ b/manifests/api.pp
+--- a/heat/manifests/api.pp
++++ b/heat/manifests/api.pp
@@ -1,6 +1,7 @@
# Installs & configure the heat API service
@@ -44,10 +44,10 @@ index ef4e454..9e418a1 100644
}
service { 'heat-api':
-diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp
+diff --git a/heat/manifests/api_cfn.pp b/heat/manifests/api_cfn.pp
index 41c4d37..1e259ea 100644
---- a/manifests/api_cfn.pp
-+++ b/manifests/api_cfn.pp
+--- a/heat/manifests/api_cfn.pp
++++ b/heat/manifests/api_cfn.pp
@@ -1,6 +1,7 @@
# Installs & configure the heat CloudFormation API service
@@ -73,10 +73,10 @@ index 41c4d37..1e259ea 100644
}
Package['heat-common'] -> Service['heat-api-cfn']
-diff --git a/manifests/api_cloudwatch.pp b/manifests/api_cloudwatch.pp
+diff --git a/heat/manifests/api_cloudwatch.pp b/heat/manifests/api_cloudwatch.pp
index ac4e7c8..b288dd5 100644
---- a/manifests/api_cloudwatch.pp
-+++ b/manifests/api_cloudwatch.pp
+--- a/heat/manifests/api_cloudwatch.pp
++++ b/heat/manifests/api_cloudwatch.pp
@@ -1,6 +1,7 @@
# Installs & configure the heat CloudWatch API service
@@ -105,10 +105,10 @@ index ac4e7c8..b288dd5 100644
Package['heat-common'] -> Service['heat-api-cloudwatch']
service { 'heat-api-cloudwatch':
-diff --git a/manifests/engine.pp b/manifests/engine.pp
+diff --git a/heat/manifests/engine.pp b/heat/manifests/engine.pp
index c5fa882..e1f40f7 100644
---- a/manifests/engine.pp
-+++ b/manifests/engine.pp
+--- a/heat/manifests/engine.pp
++++ b/heat/manifests/engine.pp
@@ -34,6 +34,7 @@
class heat::engine (
@@ -134,6 +134,3 @@ index c5fa882..e1f40f7 100644
}
service { 'heat-engine':
---
-1.9.3
-
diff --git a/manage_service-horizon.patch b/0017-horizon-Add-manage_service-feature-for-horizon.patch
similarity index 65%
rename from manage_service-horizon.patch
rename to 0017-horizon-Add-manage_service-feature-for-horizon.patch
index 3c490e5..ddca250 100644
--- a/manage_service-horizon.patch
+++ b/0017-horizon-Add-manage_service-feature-for-horizon.patch
@@ -1,19 +1,19 @@
-From 45b4ce4fcc40bd6580bd03f6ba711608542df01f Mon Sep 17 00:00:00 2001
-From: Ivan Chavero <ichavero at redhat.com>
-Date: Wed, 27 Aug 2014 13:38:32 -0600
-Subject: [PATCH] Add manage_service feature for horizon
+From 7685d628ee689d6e91215e788c5bfd8f0a7d420d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:53:32 -0500
+Subject: [PATCH] [horizon] Add manage_service feature for horizon
---
- manifests/init.pp | 10 ++++++++++
- manifests/wsgi/apache.pp | 10 ++++++++++
- spec/classes/horizon_init_spec.rb | 4 ----
- spec/classes/horizon_wsgi_apache_spec.rb | 1 -
+ horizon/manifests/init.pp | 10 ++++++++++
+ horizon/manifests/wsgi/apache.pp | 10 ++++++++++
+ horizon/spec/classes/horizon_init_spec.rb | 4 ----
+ horizon/spec/classes/horizon_wsgi_apache_spec.rb | 1 -
4 files changed, 20 insertions(+), 5 deletions(-)
-diff --git a/manifests/init.pp b/manifests/init.pp
-index 405b732..c0f02c4 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
+diff --git a/horizon/manifests/init.pp b/horizon/manifests/init.pp
+index 640a964..f23b2eb 100644
+--- a/horizon/manifests/init.pp
++++ b/horizon/manifests/init.pp
@@ -123,6 +123,12 @@
# [*configure_apache*]
# (optional) Configure Apache for Horizon. (Defaults to true)
@@ -45,10 +45,10 @@ index 405b732..c0f02c4 100644
bind_address => $bind_address,
fqdn => $fqdn,
servername => $servername,
-diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
+diff --git a/horizon/manifests/wsgi/apache.pp b/horizon/manifests/wsgi/apache.pp
index dd96ce0..e655abb 100644
---- a/manifests/wsgi/apache.pp
-+++ b/manifests/wsgi/apache.pp
+--- a/horizon/manifests/wsgi/apache.pp
++++ b/horizon/manifests/wsgi/apache.pp
@@ -35,6 +35,8 @@
# (optional) A hash of extra paramaters for apache::wsgi class.
# Defaults to {}
@@ -73,10 +73,10 @@ index dd96ce0..e655abb 100644
if $::osfamily == 'RedHat' {
class { 'apache::mod::wsgi':
wsgi_socket_prefix => '/var/run/wsgi'
-diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb
+diff --git a/horizon/spec/classes/horizon_init_spec.rb b/horizon/spec/classes/horizon_init_spec.rb
index 759c073..c5d0984 100644
---- a/spec/classes/horizon_init_spec.rb
-+++ b/spec/classes/horizon_init_spec.rb
+--- a/horizon/spec/classes/horizon_init_spec.rb
++++ b/horizon/spec/classes/horizon_init_spec.rb
@@ -7,10 +7,6 @@ describe 'horizon' do
'fqdn' => '*' }
end
@@ -88,10 +88,10 @@ index 759c073..c5d0984 100644
let :fixtures_path do
File.expand_path(File.join(__FILE__, '..', '..', 'fixtures'))
end
-diff --git a/spec/classes/horizon_wsgi_apache_spec.rb b/spec/classes/horizon_wsgi_apache_spec.rb
+diff --git a/horizon/spec/classes/horizon_wsgi_apache_spec.rb b/horizon/spec/classes/horizon_wsgi_apache_spec.rb
index c9c339e..9330447 100644
---- a/spec/classes/horizon_wsgi_apache_spec.rb
-+++ b/spec/classes/horizon_wsgi_apache_spec.rb
+--- a/horizon/spec/classes/horizon_wsgi_apache_spec.rb
++++ b/horizon/spec/classes/horizon_wsgi_apache_spec.rb
@@ -11,7 +11,6 @@ describe 'horizon::wsgi::apache' do
end
@@ -100,6 +100,3 @@ index c9c339e..9330447 100644
"class { 'horizon': secret_key => 's3cr3t', configure_apache => false }"
end
---
-1.9.3
-
diff --git a/manage_service-keystone.patch b/0018-keystone-Add-manage_service-feature.patch
similarity index 78%
rename from manage_service-keystone.patch
rename to 0018-keystone-Add-manage_service-feature.patch
index bd342a4..e7bfc9c 100644
--- a/manage_service-keystone.patch
+++ b/0018-keystone-Add-manage_service-feature.patch
@@ -1,7 +1,7 @@
-From 97662a32ec863f69d15c4e3af635f997cfa92208 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Mon, 25 Aug 2014 14:52:37 +0200
-Subject: [PATCH] Add manage_service feature
+From a3cda064845fca9e56c3f5e25362bbbd76283221 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:55:44 -0500
+Subject: [PATCH] [keystone] Add manage_service feature
puppet-keystone lacks of disabling service managing. This patch adds
$manage_service parameter to relevant class.
@@ -10,15 +10,15 @@ Change-Id: I80a55857442c6cd32387481fbe68b54f52e827a1
Closes-bug: #1359823
Conflicts:
- manifests/init.pp
+ keystone/manifests/init.pp
---
- manifests/init.pp | 16 ++++++++++++----
+ keystone/manifests/init.pp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
-diff --git a/manifests/init.pp b/manifests/init.pp
+diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
index 87cd613..ce0c7bd 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
+--- a/keystone/manifests/init.pp
++++ b/keystone/manifests/init.pp
@@ -38,6 +38,11 @@
# Defaults to /var/cache/keystone.
# [memcache_servers] List of memcache servers/ports. Optional. Used with
@@ -56,6 +56,3 @@ index 87cd613..ce0c7bd 100644
}
service { 'keystone':
---
-1.9.3
-
diff --git a/manage_service-swift.patch b/0019-swift-Add-manage_service-feature.patch
similarity index 84%
rename from manage_service-swift.patch
rename to 0019-swift-Add-manage_service-feature.patch
index d230af9..e99fe49 100644
--- a/manage_service-swift.patch
+++ b/0019-swift-Add-manage_service-feature.patch
@@ -1,7 +1,7 @@
-From a87a101049dd3397a0aa92cb6eb7057260664e52 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Wed, 20 Aug 2014 16:29:16 +0200
-Subject: [PATCH] Add manage_service feature
+From 288af828b2f7302f078d08727d4a0c33f60eae0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:57:48 -0500
+Subject: [PATCH] [swift] Add manage_service feature
puppet-swift lacks of disabling service managing. This patch adds
$manage_service and $enabled parameter to all relevant classes.
@@ -9,17 +9,17 @@ $manage_service and $enabled parameter to all relevant classes.
Closes-bug: #1359823
Change-Id: I3d632e3a26e9394d03d94089ae704904bf77aa51
---
- manifests/proxy.pp | 44 ++++++++++++++++++++++++++----------------
- manifests/storage/account.pp | 20 +++++++++++++++----
- manifests/storage/container.pp | 26 ++++++++++++++++++-------
- manifests/storage/generic.pp | 18 +++++++++++++----
- manifests/storage/object.pp | 20 +++++++++++++++----
+ swift/manifests/proxy.pp | 44 ++++++++++++++++++++++--------------
+ swift/manifests/storage/account.pp | 20 ++++++++++++----
+ swift/manifests/storage/container.pp | 26 +++++++++++++++------
+ swift/manifests/storage/generic.pp | 18 +++++++++++----
+ swift/manifests/storage/object.pp | 20 ++++++++++++----
5 files changed, 92 insertions(+), 36 deletions(-)
-diff --git a/manifests/proxy.pp b/manifests/proxy.pp
+diff --git a/swift/manifests/proxy.pp b/swift/manifests/proxy.pp
index 41b1463..6863609 100644
---- a/manifests/proxy.pp
-+++ b/manifests/proxy.pp
+--- a/swift/manifests/proxy.pp
++++ b/swift/manifests/proxy.pp
@@ -47,22 +47,24 @@
#
class swift::proxy(
@@ -81,10 +81,10 @@ index 41b1463..6863609 100644
provider => $::swift::params::service_provider,
hasstatus => true,
subscribe => Concat['/etc/swift/proxy-server.conf'],
-diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp
+diff --git a/swift/manifests/storage/account.pp b/swift/manifests/storage/account.pp
index 1ce6865..111e91c 100644
---- a/manifests/storage/account.pp
-+++ b/manifests/storage/account.pp
+--- a/swift/manifests/storage/account.pp
++++ b/swift/manifests/storage/account.pp
@@ -1,24 +1,36 @@
class swift::storage::account(
+ $manage_service = true,
@@ -126,10 +126,10 @@ index 1ce6865..111e91c 100644
provider => $::swift::params::service_provider,
require => Package['swift-account'],
}
-diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
+diff --git a/swift/manifests/storage/container.pp b/swift/manifests/storage/container.pp
index a4002d8..23d28ac 100644
---- a/manifests/storage/container.pp
-+++ b/manifests/storage/container.pp
+--- a/swift/manifests/storage/container.pp
++++ b/swift/manifests/storage/container.pp
@@ -5,27 +5,39 @@
# field for containers. Defaults to one entry list '127.0.0.1'.
#
@@ -186,10 +186,10 @@ index a4002d8..23d28ac 100644
provider => $::swift::params::service_provider,
require => File['/etc/init/swift-container-sync.conf', '/etc/init.d/swift-container-sync']
}
-diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp
+diff --git a/swift/manifests/storage/generic.pp b/swift/manifests/storage/generic.pp
index 2f84f2e..89eb6fe 100644
---- a/manifests/storage/generic.pp
-+++ b/manifests/storage/generic.pp
+--- a/swift/manifests/storage/generic.pp
++++ b/swift/manifests/storage/generic.pp
@@ -18,6 +18,8 @@
#
# Copyright 2011 Puppetlabs Inc, unless otherwise noted.
@@ -231,10 +231,10 @@ index 2f84f2e..89eb6fe 100644
hasstatus => true,
provider => $service_provider,
subscribe => Package["swift-${name}"],
-diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp
+diff --git a/swift/manifests/storage/object.pp b/swift/manifests/storage/object.pp
index 1e49101..c26d246 100644
---- a/manifests/storage/object.pp
-+++ b/manifests/storage/object.pp
+--- a/swift/manifests/storage/object.pp
++++ b/swift/manifests/storage/object.pp
@@ -1,24 +1,36 @@
class swift::storage::object(
+ $manage_service = true,
@@ -276,6 +276,3 @@ index 1e49101..c26d246 100644
provider => $::swift::params::service_provider,
require => Package['swift-object'],
}
---
-1.9.3
-
diff --git a/manage_service-glance.patch b/0020-glance-Add-manage_service-feature.patch
similarity index 83%
rename from manage_service-glance.patch
rename to 0020-glance-Add-manage_service-feature.patch
index ac6958d..bcb27fb 100644
--- a/manage_service-glance.patch
+++ b/0020-glance-Add-manage_service-feature.patch
@@ -1,7 +1,7 @@
-From 6259df9c598c6b52c249084a4417e014e745cd21 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Mon, 25 Aug 2014 15:15:55 +0200
-Subject: [PATCH] Add manage_service feature
+From 54acc8dd771da0c0d71770ff8160c490fc0fca3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 13:58:54 -0500
+Subject: [PATCH] [glance] Add manage_service feature
puppet-glance lacks of disabling service managing. This patch adds
$manage_service parameter to relevant classes.
@@ -10,17 +10,17 @@ Change-Id: I222b1a3318f5163f6ad1e39cbb8be10c440ab99f
Closes-bug: #1359823
Conflicts:
- manifests/api.pp
- manifests/registry.pp
+ glance/manifests/api.pp
+ glance/manifests/registry.pp
---
- manifests/api.pp | 15 +++++++++++----
- manifests/registry.pp | 34 +++++++++++++++++++++-------------
+ glance/manifests/api.pp | 15 +++++++++++----
+ glance/manifests/registry.pp | 34 +++++++++++++++++++++-------------
2 files changed, 32 insertions(+), 17 deletions(-)
-diff --git a/manifests/api.pp b/manifests/api.pp
+diff --git a/glance/manifests/api.pp b/glance/manifests/api.pp
index 4132014..c1977aa 100644
---- a/manifests/api.pp
-+++ b/manifests/api.pp
+--- a/glance/manifests/api.pp
++++ b/glance/manifests/api.pp
@@ -92,6 +92,10 @@
# (optional) User to authenticate as with keystone.
# Defaults to 'glance'.
@@ -57,10 +57,10 @@ index 4132014..c1977aa 100644
}
service { 'glance-api':
-diff --git a/manifests/registry.pp b/manifests/registry.pp
+diff --git a/glance/manifests/registry.pp b/glance/manifests/registry.pp
index 2798d7d..2f7abba 100644
---- a/manifests/registry.pp
-+++ b/manifests/registry.pp
+--- a/glance/manifests/registry.pp
++++ b/glance/manifests/registry.pp
@@ -75,8 +75,13 @@
# (optional) Syslog facility to receive log lines.
# Defaults to LOG_USER.
@@ -120,6 +120,3 @@ index 2798d7d..2f7abba 100644
}
service { 'glance-registry':
---
-1.9.3
-
diff --git a/manage_service-neutron.patch b/0021-neutron-Fixed-manage_service-feature.patch
similarity index 73%
rename from manage_service-neutron.patch
rename to 0021-neutron-Fixed-manage_service-feature.patch
index 9d1c4d6..975b9cd 100644
--- a/manage_service-neutron.patch
+++ b/0021-neutron-Fixed-manage_service-feature.patch
@@ -1,7 +1,7 @@
-From c927fb9d220474ef1bee021f6fb9bf22bae42ef1 Mon Sep 17 00:00:00 2001
-From: Martin Magr <mmagr at redhat.com>
-Date: Tue, 26 Aug 2014 17:54:12 +0200
-Subject: [PATCH] Fixed manage_service feature
+From ee921bd83c4813d5a8e19a942e0f8fb28a8f7ee9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 14:00:19 -0500
+Subject: [PATCH] [neutron] Fixed manage_service feature
Using manage_service=>false in class neutron::agents::ovs generates
error. This patch is fixing the issue and makes mentioned use-case
@@ -10,13 +10,13 @@ installable.
Change-Id: I5a3205c3e21e1312463f47d938f5854a189c5d38
Closes-bug: #1359823
---
- manifests/agents/ovs.pp | 24 +++++++++++++-----------
+ neutron/manifests/agents/ovs.pp | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
-diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
+diff --git a/neutron/manifests/agents/ovs.pp b/neutron/manifests/agents/ovs.pp
index 0b4401a..2db7a1a 100644
---- a/manifests/agents/ovs.pp
-+++ b/manifests/agents/ovs.pp
+--- a/neutron/manifests/agents/ovs.pp
++++ b/neutron/manifests/agents/ovs.pp
@@ -137,17 +137,19 @@ class neutron::agents::ovs (
} else {
$service_ensure = 'stopped'
@@ -48,6 +48,3 @@ index 0b4401a..2db7a1a 100644
}
}
---
-1.9.3
-
diff --git a/0001-vlan-is-not-the-same-as-vlan_start.patch b/0022-nova-vlan-is-not-the-same-as-vlan_start.patch
similarity index 53%
rename from 0001-vlan-is-not-the-same-as-vlan_start.patch
rename to 0022-nova-vlan-is-not-the-same-as-vlan_start.patch
index a49a644..3baa2ad 100644
--- a/0001-vlan-is-not-the-same-as-vlan_start.patch
+++ b/0022-nova-vlan-is-not-the-same-as-vlan_start.patch
@@ -1,9 +1,9 @@
-From c40e67f1b5cd59a1755d451e00578404fd5d4c61 Mon Sep 17 00:00:00 2001
-From: Lars Kellogg-Stedman <lars at redhat.com>
-Date: Thu, 28 Aug 2014 15:03:01 -0400
-Subject: [PATCH] --vlan is not the same as --vlan_start
+From ec035d20e3baba8c67c23a28046696c1f0474117 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 14:02:17 -0500
+Subject: [PATCH] [nova] --vlan is not the same as --vlan_start
-the lib/puppet/provider/nova_network/nova_manage.rb provider was using
+the nova/lib/puppet/provider/nova_network/nova_manage.rb provider was using
the --vlan option when it meant --vlan_start. This caused "network
create" commands with num_networks > 1 to fail with "duplicate vlan"
errors.
@@ -11,13 +11,13 @@ errors.
Change-Id: Ibdca3b8de72b459eacf8b44b6350b9bc71310c1b
Closes-bug: #1362772
---
- lib/puppet/provider/nova_network/nova_manage.rb | 2 +-
+ nova/lib/puppet/provider/nova_network/nova_manage.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/puppet/provider/nova_network/nova_manage.rb b/lib/puppet/provider/nova_network/nova_manage.rb
+diff --git a/nova/lib/puppet/provider/nova_network/nova_manage.rb b/nova/lib/puppet/provider/nova_network/nova_manage.rb
index 6eb2937..6da03a3 100644
---- a/lib/puppet/provider/nova_network/nova_manage.rb
-+++ b/lib/puppet/provider/nova_network/nova_manage.rb
+--- a/nova/lib/puppet/provider/nova_network/nova_manage.rb
++++ b/nova/lib/puppet/provider/nova_network/nova_manage.rb
@@ -30,7 +30,7 @@ Puppet::Type.type(:nova_network).provide(:nova_manage) do
:dns2 => '--dns2',
:gateway => '--gateway',
@@ -27,6 +27,3 @@ index 6eb2937..6da03a3 100644
}.each do |param, opt|
if resource[param]
optional_opts.push(opt).push(resource[param])
---
-1.9.0
-
diff --git a/0001-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch b/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
similarity index 92%
rename from 0001-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
rename to 0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
index fe5c7a4..74e1061 100644
--- a/0001-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
+++ b/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
@@ -1,7 +1,7 @@
-From 017bdca7804ac34ff52c2d882e6bf7977b04131d Mon Sep 17 00:00:00 2001
-From: Kiran Chunduri <nagchund at cisco.com>
-Date: Wed, 25 Jun 2014 09:36:35 -0700
-Subject: [PATCH] New manifest file to deploy Cisco N1KV-VEM
+From 636f09905bd2924a701f71821a671c50c45f94f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 14:06:16 -0500
+Subject: [PATCH] [neutron] New manifest file to deploy Cisco N1KV-VEM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -18,21 +18,21 @@ port-profile) to the VEM
Change-Id: Ibc8f1c4d2d743589e452ae6d1d87b5bfa123bc3a
---
- .fixtures.yml | 1 +
- Modulefile | 1 +
- manifests/agents/n1kv_vem.pp | 235 +++++++++++++++++++++++++++
- manifests/params.pp | 6 +
- spec/classes/neutron_agents_n1kv_vem_spec.rb | 181 +++++++++++++++++++++
- templates/n1kv.conf.erb | 152 +++++++++++++++++
+ neutron/.fixtures.yml | 1 +
+ neutron/Modulefile | 1 +
+ neutron/manifests/agents/n1kv_vem.pp | 235 +++++++++++++++++++++
+ neutron/manifests/params.pp | 6 +
+ .../spec/classes/neutron_agents_n1kv_vem_spec.rb | 181 ++++++++++++++++
+ neutron/templates/n1kv.conf.erb | 152 +++++++++++++
6 files changed, 576 insertions(+)
- create mode 100644 manifests/agents/n1kv_vem.pp
- create mode 100644 spec/classes/neutron_agents_n1kv_vem_spec.rb
- create mode 100644 templates/n1kv.conf.erb
+ create mode 100644 neutron/manifests/agents/n1kv_vem.pp
+ create mode 100644 neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
+ create mode 100644 neutron/templates/n1kv.conf.erb
-diff --git a/.fixtures.yml b/.fixtures.yml
+diff --git a/neutron/.fixtures.yml b/neutron/.fixtures.yml
index 883a251..be7fa9c 100644
---- a/.fixtures.yml
-+++ b/.fixtures.yml
+--- a/neutron/.fixtures.yml
++++ b/neutron/.fixtures.yml
@@ -8,5 +8,6 @@ fixtures:
ref: 'origin/0.x'
"nova": "git://github.com/stackforge/puppet-nova.git"
@@ -40,20 +40,20 @@ index 883a251..be7fa9c 100644
+ 'sysctl': 'git://github.com/duritong/puppet-sysctl.git'
symlinks:
"neutron": "#{source_dir}"
-diff --git a/Modulefile b/Modulefile
+diff --git a/neutron/Modulefile b/neutron/Modulefile
index 0a80358..d885b5d 100644
---- a/Modulefile
-+++ b/Modulefile
+--- a/neutron/Modulefile
++++ b/neutron/Modulefile
@@ -14,3 +14,4 @@ dependency 'puppetlabs/mysql', '>=0.9.0 <3.0.0'
dependency 'puppetlabs/nova', '>=4.0.0 <5.0.0'
dependency 'puppetlabs/stdlib', '>=3.2.0'
dependency 'puppetlabs/vswitch', '>=0.2.0 <1.0.0'
+dependency 'duritong/sysctl', '>=0.0.1 <1.0.0'
-diff --git a/manifests/agents/n1kv_vem.pp b/manifests/agents/n1kv_vem.pp
+diff --git a/neutron/manifests/agents/n1kv_vem.pp b/neutron/manifests/agents/n1kv_vem.pp
new file mode 100644
index 0000000..439355f
--- /dev/null
-+++ b/manifests/agents/n1kv_vem.pp
++++ b/neutron/manifests/agents/n1kv_vem.pp
@@ -0,0 +1,235 @@
+# == Class: n1kv_vem
+#
@@ -290,10 +290,10 @@ index 0000000..439355f
+ File['/etc/n1kv/n1kv.conf'] -> Package['nexus1000v']
+ Package['nexus1000v'] ~> Service['nexus1000v']
+}
-diff --git a/manifests/params.pp b/manifests/params.pp
+diff --git a/neutron/manifests/params.pp b/neutron/manifests/params.pp
index afda431..c143bf8 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
+--- a/neutron/manifests/params.pp
++++ b/neutron/manifests/params.pp
@@ -13,6 +13,9 @@ class neutron::params {
$ovs_agent_service = 'neutron-openvswitch-agent'
$ovs_server_package = 'openstack-neutron-openvswitch'
@@ -314,11 +314,11 @@ index afda431..c143bf8 100644
$linuxbridge_agent_package = 'neutron-plugin-linuxbridge-agent'
$linuxbridge_agent_service = 'neutron-plugin-linuxbridge-agent'
-diff --git a/spec/classes/neutron_agents_n1kv_vem_spec.rb b/spec/classes/neutron_agents_n1kv_vem_spec.rb
+diff --git a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
new file mode 100644
index 0000000..9b7a4b1
--- /dev/null
-+++ b/spec/classes/neutron_agents_n1kv_vem_spec.rb
++++ b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
@@ -0,0 +1,181 @@
+require 'spec_helper'
+
@@ -501,11 +501,11 @@ index 0000000..9b7a4b1
+ end
+
+end
-diff --git a/templates/n1kv.conf.erb b/templates/n1kv.conf.erb
+diff --git a/neutron/templates/n1kv.conf.erb b/neutron/templates/n1kv.conf.erb
new file mode 100644
index 0000000..8edb3e2
--- /dev/null
-+++ b/templates/n1kv.conf.erb
++++ b/neutron/templates/n1kv.conf.erb
@@ -0,0 +1,152 @@
+# This is the N1KV VEM configuration file.
+# <n1kv.conf> file contains all the configuration parameters for VEM operation.
@@ -659,6 +659,3 @@ index 0000000..8edb3e2
+# restart_on_modify: Yes
+# Format: dp-thread-socket-rrnglen <0..16384>
+# Note: 0 - disables memory map I/O
---
-1.9.3
-
diff --git a/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch b/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
new file mode 100644
index 0000000..b1d73db
--- /dev/null
+++ b/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
@@ -0,0 +1,47 @@
+From 5c2dc8b1fc52ccc2d116f31cf8a1077b7a2c266d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Wed, 19 Nov 2014 14:08:44 -0500
+Subject: [PATCH] [vswitch] Fixed issue with vlan on redhat provider
+
+When interface is a vlan, the VLAN=yes stanza must stick to interface
+configuration file and shouldn't be present on bridge ifcfg file either
+
+RHBZ#1160418
+
+Change-Id: If1c40927f7e1b26b2ae6a7eb33f6d76d41983fc3
+---
+ vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb b/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb
+index f2cf88d..2bc4374 100644
+--- a/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb
++++ b/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb
+@@ -39,6 +39,9 @@ Puppet::Type.type(:vs_port).provide(:ovs_redhat, :parent => :ovs) do
+ end
+
+ port = IFCFG::Port.new(@resource[:interface], @resource[:bridge])
++ if vlan?
++ port.set('VLAN' => 'yes')
++ end
+ port.save(BASE + @resource[:interface])
+
+ bridge = IFCFG::Bridge.new(@resource[:bridge], template)
+@@ -115,6 +118,17 @@ Puppet::Type.type(:vs_port).provide(:ovs_redhat, :parent => :ovs) do
+ items.merge!(m[1] => m[2])
+ end
+ end
++ items.delete('VLAN') if items.has_key?('VLAN')
+ items
+ end
++
++ def vlan?
++ if File.read('/proc/net/vlan/config') =~ /#{@resource[:interface]}/
++ return true
++ else
++ return false
++ end
++ rescue Errno::ENOENT
++ return false
++ end
+ end
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 5c36ef9..d030d49 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,233 +1,81 @@
-%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 d74795561b23a41be1eedf3d8c63bfb9f92360f4
-%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: 26%{?dist}
-Summary: Puppet modules used to deploy OpenStack
+Version: 2014.1.1
+Release: 1%{?dist}
+Summary: Collection of Puppet modules for OpenStack deployment
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/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
-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
-Patch1: rabbitmq-repo-manage.patch
-
-# temporary patches
-Patch100: compute_driver.patch
-Patch101: openstack.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
-Patch110: 0001-stop-puppet-from-breaking-neutron.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
-Patch117: 0001-Fixes-plugin.ini-error.patch
-Patch118: manage_service-ceilometer.patch
-Patch119: manage_service-heat.patch
-Patch120: manage_service-horizon.patch
-Patch121: manage_service-keystone.patch
-Patch122: manage_service-swift.patch
-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
+Source0: https://github.com/redhat-openstack/openstack-puppet-modules/archive/%{version}.tar.gz
+
+Patch0001: 0001-horizon-Change-default-documentation-URL.patch
+Patch0002: 0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+Patch0003: 0003-nova-Change-default-compute-driver.patch
+Patch0004: 0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
+Patch0005: 0005-firewall-Add-support-for-mac-address-source-rules.patch
+Patch0006: 0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
+Patch0007: 0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
+Patch0008: 0008-heat-Implement-Keystone-domain-creation.patch
+Patch0009: 0009-neutron-Stop-puppet-from-breaking-neutron.patch
+Patch0010: 0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
+Patch0011: 0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
+Patch0012: 0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
+Patch0013: 0013-horizon-Just-clean-original-config.patch
+Patch0014: 0014-neutron-Fixes-plugin.ini-error.patch
+Patch0015: 0015-ceilometer-Add-manage_service-feature.patch
+Patch0016: 0016-heat-Add-manage_service-feature.patch
+Patch0017: 0017-horizon-Add-manage_service-feature-for-horizon.patch
+Patch0018: 0018-keystone-Add-manage_service-feature.patch
+Patch0019: 0019-swift-Add-manage_service-feature.patch
+Patch0020: 0020-glance-Add-manage_service-feature.patch
+Patch0021: 0021-neutron-Fixed-manage_service-feature.patch
+Patch0022: 0022-nova-vlan-is-not-the-same-as-vlan_start.patch
+Patch0023: 0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
+Patch0024: 0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
BuildArch: noarch
Requires: rubygem-json
%description
-A collection of Puppet modules used to install and configure OpenStack.
+A collection of Puppet modules which are required to install and configure
+OpenStack via installers using Puppet configuration tool.
%prep
-%setup -c -q -T -D -a 0
-%setup -c -q -T -D -a 1
-%setup -c -q -T -D -a 2
-%setup -c -q -T -D -a 3
-%setup -c -q -T -D -a 4
-%setup -c -q -T -D -a 5
-%setup -c -q -T -D -a 6
-%setup -c -q -T -D -a 7
-%setup -c -q -T -D -a 8
-%setup -c -q -T -D -a 9
-%setup -c -q -T -D -a 10
-%setup -c -q -T -D -a 11
-%setup -c -q -T -D -a 12
-%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 17
-%setup -c -q -T -D -a 18
-%setup -c -q -T -D -a 19
-%setup -c -q -T -D -a 20
-%setup -c -q -T -D -a 21
-%setup -c -q -T -D -a 22
-%setup -c -q -T -D -a 23
-%setup -c -q -T -D -a 24
-%setup -c -q -T -D -a 25
-%setup -c -q -T -D -a 26
-%setup -c -q -T -D -a 27
-%setup -c -q -T -D -a 28
-%setup -c -q -T -D -a 29
-%setup -c -q -T -D -a 30
-%setup -c -q -T -D -a 31
-%setup -c -q -T -D -a 32
-%setup -c -q -T -D -a 33
-%setup -c -q -T -D -a 34
-%setup -c -q -T -D -a 35
-%setup -c -q -T -D -a 36
-%setup -c -q -T -D -a 37
-%setup -c -q -T -D -a 38
-%setup -c -q -T -D -a 39
-
-# puppet-horizon patches
-cd %{_builddir}/%{name}-%{version}/puppet-horizon-%{horizon_commit}
-%patch0 -p1
-%patch116 -p1
-%patch120 -p1
-
-# puppet-nova patches
-cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
-%patch100 -p1
-%patch113 -p1
-%patch114 -p1
-%patch125 -p1
-
-# puppet-heat patches
-cd %{_builddir}/%{name}-%{version}/puppet-heat-%{heat_commit}
-%patch107 -p1
-%patch119 -p1
-
-# puppet-openstack patches
-cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit}
-%patch101 -p1
-
-# puppetlabs-firewall patches
-cd %{_builddir}/%{name}-%{version}/puppetlabs-firewall-%{firewall_commit}
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-
-# puppet-neutron patches
-cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
-%patch110 -p1
-%patch115 -p1
-%patch117 -p1
-%patch124 -p1
-%patch126 -p1
-
-# puppetlabs-rabbitmq patches
-cd %{_builddir}/%{name}-%{version}/puppetlabs-rabbitmq-%{rabbitmq_commit}
-%patch1 -p1
-
-# puppet-ceilometer patches
-cd %{_builddir}/%{name}-%{version}/puppet-ceilometer-%{ceilometer_commit}
-%patch118 -p1
-
-# puppet-keystone patches
-cd %{_builddir}/%{name}-%{version}/puppet-keystone-%{keystone_commit}
-%patch121 -p1
-
-# puppet-swift patches
-cd %{_builddir}/%{name}-%{version}/puppet-swift-%{swift_commit}
-%patch122 -p1
-
-# puppet-glance patches
-cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit}
-%patch123 -p1
-
+%setup
+
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
+%patch0014 -p1
+%patch0015 -p1
+%patch0016 -p1
+%patch0017 -p1
+%patch0018 -p1
+%patch0019 -p1
+%patch0020 -p1
+%patch0021 -p1
+%patch0022 -p1
+%patch0023 -p1
+%patch0024 -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 {} +
find %{_builddir}/%{name}-%{version}/ \( -name "*.pp" -o -name "*.py" \) -exec chmod -x {} +
find %{_builddir}/%{name}-%{version}/ \( -name "*.rb" -o -name "*.erb" \) -exec chmod -x {} + -exec sed -i "/^#!/{d;q}" {} +
+find %{_builddir}/%{name}-%{version}/ \( -name spec -o -name ext \) | xargs rm -rf
%build
@@ -236,56 +84,61 @@ find %{_builddir}/%{name}-%{version}/ \( -name "*.rb" -o -name "*.erb" \) -exec
%install
rm -rf %{buildroot}
install -d -m 0755 %{buildroot}/%{_datadir}/openstack-puppet/modules/
-cp -r puppetlabs-apache-%{apache_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/apache
-cp -r puppet-ceilometer-%{ceilometer_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ceilometer
-cp -r puppet-certmonger-%{certmonger_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/certmonger
-cp -r puppet-cinder-%{cinder_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/cinder
-cp -r puppet-common-%{common_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/common
-cp -r puppetlabs-concat-%{concat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/concat
-cp -r puppetlabs-firewall-%{firewall_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/firewall
-cp -r puppet-galera-%{galera_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/galera
-cp -r puppet-glance-%{glance_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/glance
-cp -r puppet-gluster-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
-cp -r puppetlabs-haproxy-%{haproxy_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/haproxy
-cp -r puppet-heat-%{heat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/heat
-cp -r puppet-horizon-%{horizon_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/horizon
-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 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-n1k-vsm-%{n1k_vsm_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/n1k-vsm
-cp -r puppet-neutron-%{neutron_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
-cp -r puppet-nova-%{nova_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/nova
-cp -r puppet-nssdb-%{nssdb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/nssdb
-cp -r puppet-openstack-%{openstack_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/openstack
-cp -r puppet-pacemaker-%{pacemaker_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/pacemaker
-cp -r puppet-puppet-%{puppet_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/puppet
-cp -r puppet-qpid-%{qpid_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/qpid
-cp -r puppetlabs-rabbitmq-%{rabbitmq_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/rabbitmq
-cp -r puppetlabs-rsync-%{rsync_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/rsync
-cp -r puppet-sahara-%{sahara_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/sahara
-cp -r puppet-ssh-%{ssh_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/ssh
-cp -r puppet-staging-%{staging_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/staging
-cp -r puppetlabs-stdlib-%{stdlib_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/stdlib
-cp -r puppet-swift-%{swift_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/swift
-cp -r puppetlabs-sysctl-%{sysctl_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/sysctl
-cp -r puppet-tempest-%{tempest_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/tempest
-cp -r puppetlabs-vcsrepo-%{vcsrepo_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vcsrepo
-cp -r puppet-vlan-%{vlan_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vlan
-cp -r puppet-vswitch-%{vswitch_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/vswitch
-cp -r puppetlabs-xinetd-%{xinetd_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/xinetd
+cp -r apache %{buildroot}/%{_datadir}/openstack-puppet/modules/apache
+cp -r ceilometer %{buildroot}/%{_datadir}/openstack-puppet/modules/ceilometer
+cp -r certmonger %{buildroot}/%{_datadir}/openstack-puppet/modules/certmonger
+cp -r cinder %{buildroot}/%{_datadir}/openstack-puppet/modules/cinder
+cp -r common %{buildroot}/%{_datadir}/openstack-puppet/modules/common
+cp -r concat %{buildroot}/%{_datadir}/openstack-puppet/modules/concat
+cp -r firewall %{buildroot}/%{_datadir}/openstack-puppet/modules/firewall
+cp -r galera %{buildroot}/%{_datadir}/openstack-puppet/modules/galera
+cp -r glance %{buildroot}/%{_datadir}/openstack-puppet/modules/glance
+cp -r gluster %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster
+cp -r haproxy %{buildroot}/%{_datadir}/openstack-puppet/modules/haproxy
+cp -r heat %{buildroot}/%{_datadir}/openstack-puppet/modules/heat
+cp -r horizon %{buildroot}/%{_datadir}/openstack-puppet/modules/horizon
+cp -r inifile %{buildroot}/%{_datadir}/openstack-puppet/modules/inifile
+cp -r keystone %{buildroot}/%{_datadir}/openstack-puppet/modules/keystone
+cp -r memcached %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached
+cp -r module-data %{buildroot}/%{_datadir}/openstack-puppet/modules/module-data
+cp -r mongodb %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb
+cp -r mysql %{buildroot}/%{_datadir}/openstack-puppet/modules/mysql
+cp -r n1k-vsm %{buildroot}/%{_datadir}/openstack-puppet/modules/n1k-vsm
+cp -r neutron %{buildroot}/%{_datadir}/openstack-puppet/modules/neutron
+cp -r nova %{buildroot}/%{_datadir}/openstack-puppet/modules/nova
+cp -r nssdb %{buildroot}/%{_datadir}/openstack-puppet/modules/nssdb
+cp -r openstack %{buildroot}/%{_datadir}/openstack-puppet/modules/openstack
+cp -r pacemaker %{buildroot}/%{_datadir}/openstack-puppet/modules/pacemaker
+cp -r puppet %{buildroot}/%{_datadir}/openstack-puppet/modules/puppet
+cp -r qpid %{buildroot}/%{_datadir}/openstack-puppet/modules/qpid
+cp -r rabbitmq %{buildroot}/%{_datadir}/openstack-puppet/modules/rabbitmq
+cp -r rsync %{buildroot}/%{_datadir}/openstack-puppet/modules/rsync
+cp -r sahara %{buildroot}/%{_datadir}/openstack-puppet/modules/sahara
+cp -r ssh %{buildroot}/%{_datadir}/openstack-puppet/modules/ssh
+cp -r staging %{buildroot}/%{_datadir}/openstack-puppet/modules/staging
+cp -r stdlib %{buildroot}/%{_datadir}/openstack-puppet/modules/stdlib
+cp -r swift %{buildroot}/%{_datadir}/openstack-puppet/modules/swift
+cp -r sysctl %{buildroot}/%{_datadir}/openstack-puppet/modules/sysctl
+cp -r tempest %{buildroot}/%{_datadir}/openstack-puppet/modules/tempest
+cp -r vcsrepo %{buildroot}/%{_datadir}/openstack-puppet/modules/vcsrepo
+cp -r vlan %{buildroot}/%{_datadir}/openstack-puppet/modules/vlan
+cp -r vswitch %{buildroot}/%{_datadir}/openstack-puppet/modules/vswitch
+cp -r xinetd %{buildroot}/%{_datadir}/openstack-puppet/modules/xinetd
+cp Puppetfile %{buildroot}/%{_datadir}/openstack-puppet/Puppetfile
rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncproxy.init
%files
%{_datadir}/openstack-puppet/modules/*
+%{_datadir}/openstack-puppet/Puppetfile
%changelog
+* Wed Nov 19 2014 Martin Mágr <mmagr at redhat.com> 2014.1.1-1
+- Update to upstream 2014.1.1
+
* Mon Oct 27 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-26
-- Update neutron commit (rhbz#1146136)
+- Update neutron commit (rhbz#1146136)
* 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)
diff --git a/sources b/sources
index 8c71e17..c683ada 100644
--- a/sources
+++ b/sources
@@ -1,40 +1 @@
-7f8b4d8f9175173e2b4dd9b779d132c8 apache-769ff363a8a3c51e24f63a2494217d2d029289c6.tar.gz
-59b1194fe8f4ea8c362b98d3001cc071 ceilometer-aa3933ccde8a4f8d39736a2d503cb085d4fae998.tar.gz
-35c3c53f442b591a4da3bfa75610069d certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz
-7cec3ddc47ac7beaf7f14174fa94f595 cinder-4f8ce803de9cf0f1a2031f4427714346bf06127f.tar.gz
-6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz
-3c9eb814f24e276f7198889c3fa8ea15 concat-644fb1b6dc8b64accc4d1208d6127b79a08a38b7.tar.gz
-3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz
-6aaf62820b0c206be54c0a792bc58d5a galera-e35922bbb31ef2e6a86c7973cbafea96a8b160af.tar.gz
-590eefb9f7520cf37b3513031dba426f glance-cb0daf02d7a991be642e62294912d93b036c6a5a.tar.gz
-b54c34d8b2137625d26b44f9616cd4fb gluster-8da4002f83e6505c7c09042df1c10cb1e290c7c7.tar.gz
-edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz
-1968e37175f6f9306d2c4b95e04a4ec6 heat-17736b2fd726858cb83590f8a8b1d594a087ea44.tar.gz
-4005e51f0d86735bbe53836b84112b3d horizon-bd1c31e87dd0564a8fab8de0516dbbe48241b09a.tar.gz
-b92cb5bb97ea2c2ccdd6fbd361cbb2e7 inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz
-796b5f7233b2dc0b5c59049fbc61c52a keystone-e61e4c2ab5c67150237e59dab25679ec739d3ebf.tar.gz
-d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz
-8506a98c0ceddf5299bdfe579e256c3f module-data-159fc5e0e21ce9df96c777f0064b5eca88e29cae.tar.gz
-7b81ce16b4b80c1e5e9d9ab768e75abc mongodb-0518f864afcce2ebb79f1f2edab5de323c811af7.tar.gz
-a2f1709b943b95a79a92f6c4be93dba4 mysql-98152e358626915ab7d918a21b21edbffe46504d.tar.gz
-ccccd1eea52c642122ff2dd0849c1571 n1k-vsm-69ff094069506f98431182c6097b3b6b9ea6fdb9.tar.gz
-3f9e87c15ebe5867c3f58f3724ea14e4 neutron-d74795561b23a41be1eedf3d8c63bfb9f92360f4.tar.gz
-0c2d1ad1dac1c27b6fe75a016a3052d7 nova-0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb.tar.gz
-ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz
-b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.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
-ed84fcfd855b066f6d74777d5d6b76cc sahara-f4e5681cfb289113be1ba49c12709145ecbad938.tar.gz
-1a50e27c52661099d075556242a4a26e ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
-387ad714db76de1e17b810b9db930f3f staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz
-4e4a07838966a58f90eab3c5b8e4baea stdlib-62e8c1d76902e6f22cb9f7b3abd43e757b4130a3.tar.gz
-4e6d94b6a1b25ac1b284a023039e7556 swift-80ec3a7576efad5e13d37a8c760ed0ad7f36055f.tar.gz
-9f332abf798b359d5f6d732a8b8fe95a sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz
-5905e569c1cff4429600d387e79de0f2 tempest-792be887b61ad9c38706e968a21752cfb05c2381.tar.gz
-ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz
-203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
-f7e96d9250232b7b6826dbeeee17ad96 vswitch-17b62e56e07eeed25fd2aaef278a16c97155a115.tar.gz
-575157496e3c7027df7be4d1f0f19eb9 xinetd-6b02de8d4f30a819eb404048e4258e3a5e8023c8.tar.gz
+a12e2fcdc1d39f24e7900622eb39e63c 2014.1.1.tar.gz
More information about the scm-commits
mailing list