[openstack-puppet-modules/icehouse-epel7] Updated to 21
Martin Mágr
mmagr at fedoraproject.org
Thu Sep 4 20:22:17 UTC 2014
commit 219dbd6f6c6e28ec57f57ef4f432aceb03f4a097
Author: Ivan Chavero <ichavero at redhat.com>
Date: Wed Sep 3 01:50:59 2014 -0600
Updated to 21
- Updated to #20
0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
(rhbz#1133446)
- Added 0001-vlan-is-not-the-same-as-vlan_start.patch (rhbz#1135079)
- Added manage_service-neutron.patch (rhbz#1134000)
- Updated puppet-galera module (rhbz#1129397)
- Added manage_service-ceilometer.patch (rhbz#1129410)
- Added manage_service-heat.patch (rhbz#1129407)
- Added manage_service-horizon.patch (rhbz#1129408)
- Added manage_service-keystone.patch (rhbz#1129399)
- Added manage_service-swift.patch (rhbz#1129409)
- Added manage_service-glance.patch (rhbz#1129404)
...fored-a-more-suitable-ovs_redhat-provider.patch | 52 +++-
0001-vlan-is-not-the-same-as-vlan_start.patch | 32 +++
manage_service-ceilometer.patch | 237 +++++++++++++++++
manage_service-glance.patch | 125 +++++++++
manage_service-heat.patch | 139 ++++++++++
manage_service-horizon.patch | 105 ++++++++
manage_service-keystone.patch | 61 +++++
manage_service-neutron.patch | 53 ++++
manage_service-swift.patch | 281 ++++++++++++++++++++
openstack-puppet-modules.spec | 128 ++++++---
sources | 1 +
11 files changed, 1158 insertions(+), 56 deletions(-)
---
diff --git a/0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch b/0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
index 87346e3..4ecc4a1 100644
--- a/0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
+++ b/0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
@@ -1,4 +1,4 @@
-From f30b59782890706fb082a7321f4111570bcf58bb Mon Sep 17 00:00:00 2001
+From 87e21ac6b3a62df614c082f973f817f5ef5c6e61 Mon Sep 17 00:00:00 2001
From: Gilles Dubreuil <gilles at redhat.com>
Date: Wed, 21 May 2014 10:13:00 +1000
Subject: [PATCH] Refacfored a more suitable ovs_redhat provider
@@ -22,12 +22,14 @@ When the bridge is associated with an active physical interface
Change-Id: I584fb1442de9a760b3a092f96cbfcbcd6776fdba
---
- lib/puppet/provider/vs_bridge/ovs_redhat.rb | 51 --------
- lib/puppet/provider/vs_port/ovs_redhat.rb | 181 +++++++++++++++-------------
- lib/puppet/type/vs_port.rb | 20 +--
- lib/puppetx/redhat/ifcfg.rb | 82 +++++++++++++
- 4 files changed, 181 insertions(+), 153 deletions(-)
+ lib/puppet/provider/vs_bridge/ovs_redhat.rb | 51 --------
+ lib/puppet/provider/vs_port/ovs_redhat.rb | 179 ++++++++++++++------------
+ lib/puppet/provider/vs_port/ovs_redhat_el6.rb | 17 +++
+ lib/puppet/type/vs_port.rb | 20 +--
+ lib/puppetx/redhat/ifcfg.rb | 82 ++++++++++++
+ 5 files changed, 197 insertions(+), 152 deletions(-)
delete mode 100644 lib/puppet/provider/vs_bridge/ovs_redhat.rb
+ create mode 100644 lib/puppet/provider/vs_port/ovs_redhat_el6.rb
create mode 100644 lib/puppetx/redhat/ifcfg.rb
diff --git a/lib/puppet/provider/vs_bridge/ovs_redhat.rb b/lib/puppet/provider/vs_bridge/ovs_redhat.rb
@@ -88,7 +90,7 @@ index 5495d12..0000000
- end
-end
diff --git a/lib/puppet/provider/vs_port/ovs_redhat.rb b/lib/puppet/provider/vs_port/ovs_redhat.rb
-index 6d43797..4f30a43 100644
+index 6d43797..f2cf88d 100644
--- a/lib/puppet/provider/vs_port/ovs_redhat.rb
+++ b/lib/puppet/provider/vs_port/ovs_redhat.rb
@@ -1,105 +1,120 @@
@@ -147,8 +149,8 @@ index 6d43797..4f30a43 100644
+ bridge.set(extras) if extras
+ bridge.save(BASE + @resource[:bridge])
+
-+ ifdown(@resource[:interface])
+ ifdown(@resource[:bridge])
++ ifdown(@resource[:interface])
+ ifup(@resource[:interface])
+ ifup(@resource[:bridge])
+ end
@@ -272,8 +274,6 @@ index 6d43797..4f30a43 100644
-
- if bridge_mac_address
- bridge_file << "OVS_EXTRA=\"set bridge #{@resource[:bridge]} other-config:hwaddr=#{bridge_mac_address}\"\n"
-- end
-- bridge_file.close
+ list
+ end
+
@@ -286,16 +286,40 @@ index 6d43797..4f30a43 100644
+
+ def from_str(data)
+ items = {}
-+ data.each_line { |line|
-+ line.match(/^(.*)=(.*)$/) { |m|
++ data.each_line do |line|
++ if m = line.match(/^(.*)=(.*)$/)
+ items.merge!(m[1] => m[2])
-+ }
-+ }
++ end
+ end
+- bridge_file.close
+ items
end
-end
\ No newline at end of file
+end
+diff --git a/lib/puppet/provider/vs_port/ovs_redhat_el6.rb b/lib/puppet/provider/vs_port/ovs_redhat_el6.rb
+new file mode 100644
+index 0000000..c50a9b9
+--- /dev/null
++++ b/lib/puppet/provider/vs_port/ovs_redhat_el6.rb
+@@ -0,0 +1,17 @@
++Puppet::Type.type(:vs_port).provide(:ovs_redhat_el6, :parent => :ovs_redhat) do
++ desc 'Openvswitch port manipulation for RedHat OSes family'
++
++ confine :osfamily => :redhat, :operatingsystemmajrelease => 6
++ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => 6
++
++ private
++
++ def dynamic?
++ # iproute doesn't behave as expected on rhel6 for dynamic interfaces
++ if File.read(BASE + @resource[:interface]) =~ /^BOOTPROTO=['"]?dhcp['"]?$/
++ return true
++ else
++ return false
++ end
++ end
++end
diff --git a/lib/puppet/type/vs_port.rb b/lib/puppet/type/vs_port.rb
index df4705e..4527bd9 100644
--- a/lib/puppet/type/vs_port.rb
diff --git a/0001-vlan-is-not-the-same-as-vlan_start.patch b/0001-vlan-is-not-the-same-as-vlan_start.patch
new file mode 100644
index 0000000..a49a644
--- /dev/null
+++ b/0001-vlan-is-not-the-same-as-vlan_start.patch
@@ -0,0 +1,32 @@
+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
+
+the 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.
+
+Change-Id: Ibdca3b8de72b459eacf8b44b6350b9bc71310c1b
+Closes-bug: #1362772
+---
+ 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
+index 6eb2937..6da03a3 100644
+--- a/lib/puppet/provider/nova_network/nova_manage.rb
++++ b/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',
+ :bridge => '--bridge',
+- :vlan_start => '--vlan'
++ :vlan_start => '--vlan_start'
+ }.each do |param, opt|
+ if resource[param]
+ optional_opts.push(opt).push(resource[param])
+--
+1.9.0
+
diff --git a/manage_service-ceilometer.patch b/manage_service-ceilometer.patch
new file mode 100644
index 0000000..673f900
--- /dev/null
+++ b/manage_service-ceilometer.patch
@@ -0,0 +1,237 @@
+From 26fd14602be2687db9b7cb236d1014bbfefe9d16 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
+
+puppet-ceilometer lacks of disabling service managing. This patch adds
+$manage_service parameter to all relevant classes.
+
+Closes-bug: #1359823
+Change-Id: Iee545b46ef5d7cf92859356ae84b8103564bf047
+
+Conflicts:
+ manifests/collector.pp
+---
+ manifests/agent/central.pp | 13 ++++++++-----
+ manifests/agent/compute.pp | 13 ++++++++-----
+ manifests/agent/notification.pp | 11 +++++++----
+ manifests/alarm/evaluator.pp | 13 ++++++++-----
+ manifests/alarm/notifier.pp | 11 +++++++----
+ manifests/api.pp | 11 +++++++----
+ manifests/collector.pp | 13 ++++++++-----
+ 7 files changed, 53 insertions(+), 32 deletions(-)
+
+diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
+index 0a07856..4f7aee2 100644
+--- a/manifests/agent/central.pp
++++ b/manifests/agent/central.pp
+@@ -5,7 +5,8 @@
+ # Should the service be enabled. Optional. Defauls to true
+ #
+ class ceilometer::agent::central (
+- $enabled = true,
++ $manage_service = true,
++ $enabled = true,
+ ) {
+
+ include ceilometer::params
+@@ -18,10 +19,12 @@ class ceilometer::agent::central (
+ name => $::ceilometer::params::agent_central_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-agent-central']
+diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
+index fde3705..df9cc8d 100644
+--- a/manifests/agent/compute.pp
++++ b/manifests/agent/compute.pp
+@@ -7,7 +7,8 @@
+ # Optional. Defaults to true
+ #
+ class ceilometer::agent::compute (
+- $enabled = true,
++ $manage_service = true,
++ $enabled = true,
+ ) inherits ceilometer {
+
+ include ceilometer::params
+@@ -30,10 +31,12 @@ class ceilometer::agent::compute (
+ }
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-agent-compute']
+diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
+index 2999362..fe1765d 100644
+--- a/manifests/agent/notification.pp
++++ b/manifests/agent/notification.pp
+@@ -38,6 +38,7 @@
+ #
+
+ class ceilometer::agent::notification (
++ $manage_service = true,
+ $enabled = true,
+ $ack_on_event_error = true,
+ $store_events = false
+@@ -50,10 +51,12 @@ class ceilometer::agent::notification (
+ Package[$::ceilometer::params::agent_notification_package_name] -> Service['ceilometer-agent-notification']
+ ensure_packages([$::ceilometer::params::agent_notification_package_name])
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-agent-notification']
+diff --git a/manifests/alarm/evaluator.pp b/manifests/alarm/evaluator.pp
+index 2621534..7b2366e 100644
+--- a/manifests/alarm/evaluator.pp
++++ b/manifests/alarm/evaluator.pp
+@@ -13,7 +13,8 @@
+ # Record alarm change events
+ #
+ class ceilometer::alarm::evaluator (
+- $enabled = true,
++ $manage_service = true,
++ $enabled = true,
+ $evaluation_interval = 60,
+ $evaluation_service = 'ceilometer.alarm.service.SingletonAlarmService',
+ $partition_rpc_topic = 'alarm_partition_coordination',
+@@ -30,10 +31,12 @@ class ceilometer::alarm::evaluator (
+ Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
+ ensure_packages($::ceilometer::params::alarm_package_name)
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-alarm-evaluator']
+diff --git a/manifests/alarm/notifier.pp b/manifests/alarm/notifier.pp
+index 1b09baa..29d9d2b 100644
+--- a/manifests/alarm/notifier.pp
++++ b/manifests/alarm/notifier.pp
+@@ -14,6 +14,7 @@
+ # should the ssl verify parameter be enabled
+ #
+ class ceilometer::alarm::notifier (
++ $manage_service = true,
+ $enabled = true,
+ $notifier_rpc_topic = undef,
+ $rest_notifier_certificate_key = undef,
+@@ -31,10 +32,12 @@ class ceilometer::alarm::notifier (
+ Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
+ ensure_packages($::ceilometer::params::alarm_package_name)
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-alarm-notifier']
+diff --git a/manifests/api.pp b/manifests/api.pp
+index 92406a8..9182ba2 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -37,6 +37,7 @@
+ #
+
+ class ceilometer::api (
++ $manage_service = true,
+ $enabled = true,
+ $keystone_host = '127.0.0.1',
+ $keystone_port = '35357',
+@@ -63,10 +64,12 @@ class ceilometer::api (
+ name => $::ceilometer::params::api_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-api']
+diff --git a/manifests/collector.pp b/manifests/collector.pp
+index cc0661f..a489143 100644
+--- a/manifests/collector.pp
++++ b/manifests/collector.pp
+@@ -5,7 +5,8 @@
+ # should the service be enabled
+ #
+ class ceilometer::collector (
+- $enabled = true,
++ $manage_service = true,
++ $enabled = true,
+ ) {
+
+ include ceilometer::params
+@@ -15,10 +16,12 @@ class ceilometer::collector (
+ Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector']
+ ensure_packages([$::ceilometer::params::collector_package_name])
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['ceilometer-common'] -> Service['ceilometer-collector']
+--
+1.9.3
+
diff --git a/manage_service-glance.patch b/manage_service-glance.patch
new file mode 100644
index 0000000..ac6958d
--- /dev/null
+++ b/manage_service-glance.patch
@@ -0,0 +1,125 @@
+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
+
+puppet-glance lacks of disabling service managing. This patch adds
+$manage_service parameter to relevant classes.
+
+Change-Id: I222b1a3318f5163f6ad1e39cbb8be10c440ab99f
+Closes-bug: #1359823
+
+Conflicts:
+ manifests/api.pp
+ manifests/registry.pp
+---
+ manifests/api.pp | 15 +++++++++++----
+ manifests/registry.pp | 34 +++++++++++++++++++++-------------
+ 2 files changed, 32 insertions(+), 17 deletions(-)
+
+diff --git a/manifests/api.pp b/manifests/api.pp
+index 4132014..c1977aa 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -92,6 +92,10 @@
+ # (optional) User to authenticate as with keystone.
+ # Defaults to 'glance'.
+ #
++# [*manage_service*]
++# (optional) If Puppet should manage service startup / shutdown.
++# Defaults to true.
++#
+ # [*enabled*]
+ # (optional) Whether to enable services.
+ # Defaults to true.
+@@ -167,6 +171,7 @@ class glance::api(
+ $pipeline = 'keystone+cachemanagement',
+ $keystone_tenant = 'services',
+ $keystone_user = 'glance',
++ $manage_service = true,
+ $enabled = true,
+ $sql_idle_timeout = '3600',
+ $sql_connection = 'sqlite:///var/lib/glance/glance.sqlite',
+@@ -393,10 +398,12 @@ class glance::api(
+ '/etc/glance/glance-cache.conf']:
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ service { 'glance-api':
+diff --git a/manifests/registry.pp b/manifests/registry.pp
+index 2798d7d..2f7abba 100644
+--- a/manifests/registry.pp
++++ b/manifests/registry.pp
+@@ -75,8 +75,13 @@
+ # (optional) Syslog facility to receive log lines.
+ # Defaults to LOG_USER.
+ #
++# [*manage_service*]
++# (optional) If Puppet should manage service startup / shutdown.
++# Defaults to true.
++#
+ # [*enabled*]
+-# (optional) Should the service be enabled. Defaults to true.
++# (optional) Should the service be enabled.
++# Defaults to true.
+ #
+ # [*purge_config*]
+ # (optional) Whether to create only the specified config values in
+@@ -121,6 +126,7 @@ class glance::registry(
+ $pipeline = 'keystone',
+ $use_syslog = false,
+ $log_facility = 'LOG_USER',
++ $manage_service = true,
+ $enabled = true,
+ $purge_config = false,
+ $cert_file = false,
+@@ -292,21 +298,23 @@ class glance::registry(
+ '/etc/glance/glance-registry-paste.ini']:
+ }
+
+- if $enabled {
+
+- Exec['glance-manage db_sync'] ~> Service['glance-registry']
++ if $manage_service {
++ if $enabled {
++ Exec['glance-manage db_sync'] ~> Service['glance-registry']
+
+- exec { 'glance-manage db_sync':
+- command => $::glance::params::db_sync_command,
+- path => '/usr/bin',
+- user => 'glance',
+- refreshonly => true,
+- logoutput => on_failure,
+- subscribe => [Package[$glance::params::registry_package_name], File['/etc/glance/glance-registry.conf']],
++ exec { 'glance-manage db_sync':
++ command => $::glance::params::db_sync_command,
++ path => '/usr/bin',
++ user => 'glance',
++ refreshonly => true,
++ logoutput => on_failure,
++ subscribe => [Package[$glance::params::registry_package_name], File['/etc/glance/glance-registry.conf']],
++ }
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
+ }
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
+ }
+
+ service { 'glance-registry':
+--
+1.9.3
+
diff --git a/manage_service-heat.patch b/manage_service-heat.patch
new file mode 100644
index 0000000..230357c
--- /dev/null
+++ b/manage_service-heat.patch
@@ -0,0 +1,139 @@
+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
+
+puppet-heat lacks of disabling service managing. This patch adds
+$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 +++++++----
+ 4 files changed, 29 insertions(+), 16 deletions(-)
+
+diff --git a/manifests/api.pp b/manifests/api.pp
+index ef4e454..9e418a1 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -1,6 +1,7 @@
+ # Installs & configure the heat API service
+
+ class heat::api (
++ $manage_service = true,
+ $enabled = true,
+ $bind_host = '0.0.0.0',
+ $bind_port = '8004',
+@@ -20,10 +21,12 @@ class heat::api (
+ name => $::heat::params::api_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ service { 'heat-api':
+diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp
+index 41c4d37..1e259ea 100644
+--- a/manifests/api_cfn.pp
++++ b/manifests/api_cfn.pp
+@@ -1,6 +1,7 @@
+ # Installs & configure the heat CloudFormation API service
+
+ class heat::api_cfn (
++ $manage_service = true,
+ $enabled = true,
+ $bind_host = '0.0.0.0',
+ $bind_port = '8000',
+@@ -19,10 +20,12 @@ class heat::api_cfn (
+ name => $::heat::params::api_cfn_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ Package['heat-common'] -> Service['heat-api-cfn']
+diff --git a/manifests/api_cloudwatch.pp b/manifests/api_cloudwatch.pp
+index ac4e7c8..b288dd5 100644
+--- a/manifests/api_cloudwatch.pp
++++ b/manifests/api_cloudwatch.pp
+@@ -1,6 +1,7 @@
+ # Installs & configure the heat CloudWatch API service
+
+ class heat::api_cloudwatch (
++ $manage_service = true,
+ $enabled = true,
+ $bind_host = '0.0.0.0',
+ $bind_port = '8003',
+@@ -19,12 +20,15 @@ class heat::api_cloudwatch (
+ name => $::heat::params::api_cloudwatch_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
++
+ Package['heat-common'] -> Service['heat-api-cloudwatch']
+
+ service { 'heat-api-cloudwatch':
+diff --git a/manifests/engine.pp b/manifests/engine.pp
+index c5fa882..e1f40f7 100644
+--- a/manifests/engine.pp
++++ b/manifests/engine.pp
+@@ -34,6 +34,7 @@
+
+ class heat::engine (
+ $auth_encryption_key,
++ $manage_service = true,
+ $enabled = true,
+ $heat_stack_user_role = 'heat_stack_user',
+ $heat_metadata_server_url = 'http://127.0.0.1:8000',
+@@ -53,10 +54,12 @@ class heat::engine (
+ name => $::heat::params::engine_package_name,
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ service { 'heat-engine':
+--
+1.9.3
+
diff --git a/manage_service-horizon.patch b/manage_service-horizon.patch
new file mode 100644
index 0000000..3c490e5
--- /dev/null
+++ b/manage_service-horizon.patch
@@ -0,0 +1,105 @@
+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
+
+---
+ manifests/init.pp | 10 ++++++++++
+ manifests/wsgi/apache.pp | 10 ++++++++++
+ spec/classes/horizon_init_spec.rb | 4 ----
+ 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
+@@ -123,6 +123,12 @@
+ # [*configure_apache*]
+ # (optional) Configure Apache for Horizon. (Defaults to true)
+ #
++# [*manage_apache*]
++# (optional) Start Apache. (Defaults to true)
++#
++# [*enable_apache*]
++# (optional) Enable Apache startup after reboot. (Defaults to true)
++#
+ # [*bind_address*]
+ # (optional) Bind address in Apache for Horizon. (Defaults to undef)
+ #
+@@ -188,6 +194,8 @@ class horizon(
+ $help_url = 'http://openstack.redhat.com/Docs',
+ $local_settings_template = 'horizon/local_settings.py.erb',
+ $configure_apache = true,
++ $manage_apache = true,
++ $enable_apache = true,
+ $bind_address = undef,
+ $servername = $::fqdn,
+ $listen_ssl = false,
+@@ -281,6 +289,8 @@ class horizon(
+
+ if $configure_apache {
+ class { 'horizon::wsgi::apache':
++ manage_service => $manage_apache,
++ enabled => $enable_apache,
+ bind_address => $bind_address,
+ fqdn => $fqdn,
+ servername => $servername,
+diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
+index dd96ce0..e655abb 100644
+--- a/manifests/wsgi/apache.pp
++++ b/manifests/wsgi/apache.pp
+@@ -35,6 +35,8 @@
+ # (optional) A hash of extra paramaters for apache::wsgi class.
+ # Defaults to {}
+ class horizon::wsgi::apache (
++ $manage_service = true,
++ $enabled = true,
+ $bind_address = undef,
+ $fqdn = $::fqdn,
+ $servername = $::fqdn,
+@@ -54,6 +56,14 @@ class horizon::wsgi::apache (
+ include ::horizon::params
+ include ::apache
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ 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
+index 759c073..c5d0984 100644
+--- a/spec/classes/horizon_init_spec.rb
++++ b/spec/classes/horizon_init_spec.rb
+@@ -7,10 +7,6 @@ describe 'horizon' do
+ 'fqdn' => '*' }
+ end
+
+- let :pre_condition do
+- 'include apache'
+- end
+-
+ 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
+index c9c339e..9330447 100644
+--- a/spec/classes/horizon_wsgi_apache_spec.rb
++++ b/spec/classes/horizon_wsgi_apache_spec.rb
+@@ -11,7 +11,6 @@ describe 'horizon::wsgi::apache' do
+ end
+
+ let :pre_condition do
+- "include apache\n" +
+ "class { 'horizon': secret_key => 's3cr3t', configure_apache => false }"
+ end
+
+--
+1.9.3
+
diff --git a/manage_service-keystone.patch b/manage_service-keystone.patch
new file mode 100644
index 0000000..bd342a4
--- /dev/null
+++ b/manage_service-keystone.patch
@@ -0,0 +1,61 @@
+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
+
+puppet-keystone lacks of disabling service managing. This patch adds
+$manage_service parameter to relevant class.
+
+Change-Id: I80a55857442c6cd32387481fbe68b54f52e827a1
+Closes-bug: #1359823
+
+Conflicts:
+ manifests/init.pp
+---
+ manifests/init.pp | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/manifests/init.pp b/manifests/init.pp
+index 87cd613..ce0c7bd 100644
+--- a/manifests/init.pp
++++ b/manifests/init.pp
+@@ -38,6 +38,11 @@
+ # Defaults to /var/cache/keystone.
+ # [memcache_servers] List of memcache servers/ports. Optional. Used with
+ # token_driver keystone.token.backends.memcache.Token. Defaults to false.
++#
++# [manage_service]
++# (optional) If Puppet should manage service startup / shutdown.
++# Defaults to true.
++#
+ # [enabled] If the keystone services should be enabled. Optional. Default to true.
+ # [sql_connection] Url used to connect to database.
+ # [idle_timeout] Timeout when db connections should be reaped.
+@@ -168,6 +173,7 @@ class keystone(
+ $ssl_cert_subject = '/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost',
+ $cache_dir = '/var/cache/keystone',
+ $memcache_servers = false,
++ $manage_service = true,
+ $enabled = true,
+ $sql_connection = 'sqlite:////var/lib/keystone/keystone.db',
+ $idle_timeout = '200',
+@@ -403,10 +409,12 @@ class keystone(
+ keystone_config { 'DEFAULT/rabbit_ha_queues': value => false }
+ }
+
+- if $enabled {
+- $service_ensure = 'running'
+- } else {
+- $service_ensure = 'stopped'
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
+ }
+
+ service { 'keystone':
+--
+1.9.3
+
diff --git a/manage_service-neutron.patch b/manage_service-neutron.patch
new file mode 100644
index 0000000..9d1c4d6
--- /dev/null
+++ b/manage_service-neutron.patch
@@ -0,0 +1,53 @@
+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
+
+Using manage_service=>false in class neutron::agents::ovs generates
+error. This patch is fixing the issue and makes mentioned use-case
+installable.
+
+Change-Id: I5a3205c3e21e1312463f47d938f5854a189c5d38
+Closes-bug: #1359823
+---
+ manifests/agents/ovs.pp | 24 +++++++++++++-----------
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
+index 0b4401a..2db7a1a 100644
+--- a/manifests/agents/ovs.pp
++++ b/manifests/agents/ovs.pp
+@@ -137,17 +137,19 @@ class neutron::agents::ovs (
+ } else {
+ $service_ensure = 'stopped'
+ }
+- service { 'neutron-plugin-ovs-service':
+- ensure => $service_ensure,
+- name => $::neutron::params::ovs_agent_service,
+- enable => $enabled,
+- require => Class['neutron'],
+- }
+- if $::neutron::params::ovs_cleanup_service {
+- service {'ovs-cleanup-service':
+- name => $::neutron::params::ovs_cleanup_service,
+- enable => $enabled,
+- }
++ }
++
++ service { 'neutron-plugin-ovs-service':
++ ensure => $service_ensure,
++ name => $::neutron::params::ovs_agent_service,
++ enable => $enabled,
++ require => Class['neutron'],
++ }
++
++ if $::neutron::params::ovs_cleanup_service {
++ service {'ovs-cleanup-service':
++ name => $::neutron::params::ovs_cleanup_service,
++ enable => $enabled,
+ }
+ }
+
+--
+1.9.3
+
diff --git a/manage_service-swift.patch b/manage_service-swift.patch
new file mode 100644
index 0000000..d230af9
--- /dev/null
+++ b/manage_service-swift.patch
@@ -0,0 +1,281 @@
+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
+
+puppet-swift lacks of disabling service managing. This patch adds
+$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 +++++++++++++++----
+ 5 files changed, 92 insertions(+), 36 deletions(-)
+
+diff --git a/manifests/proxy.pp b/manifests/proxy.pp
+index 41b1463..6863609 100644
+--- a/manifests/proxy.pp
++++ b/manifests/proxy.pp
+@@ -47,22 +47,24 @@
+ #
+ class swift::proxy(
+ $proxy_local_net_ip,
+- $port = '8080',
+- $pipeline = ['healthcheck', 'cache', 'tempauth', 'proxy-server'],
+- $workers = $::processorcount,
+- $allow_account_management = true,
+- $account_autocreate = true,
+- $log_headers = 'False',
+- $log_udp_host = '',
+- $log_udp_port = '',
+- $log_address = '/dev/log',
+- $log_level = 'INFO',
+- $log_facility = 'LOG_LOCAL1',
+- $log_handoffs = true,
+- $read_affinity = undef,
+- $write_affinity = undef,
++ $port = '8080',
++ $pipeline = ['healthcheck', 'cache', 'tempauth', 'proxy-server'],
++ $workers = $::processorcount,
++ $allow_account_management = true,
++ $account_autocreate = true,
++ $log_headers = 'False',
++ $log_udp_host = '',
++ $log_udp_port = '',
++ $log_address = '/dev/log',
++ $log_level = 'INFO',
++ $log_facility = 'LOG_LOCAL1',
++ $log_handoffs = true,
++ $read_affinity = undef,
++ $write_affinity = undef,
+ $write_affinity_node_count = undef,
+- $package_ensure = 'present'
++ $manage_service = true,
++ $enabled = true,
++ $package_ensure = 'present'
+ ) {
+
+ include swift::params
+@@ -126,10 +128,18 @@ class swift::proxy(
+ before => Class[$required_classes],
+ }
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ service { 'swift-proxy':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::proxy_service_name,
+- enable => true,
++ enable => $enabled,
+ 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
+index 1ce6865..111e91c 100644
+--- a/manifests/storage/account.pp
++++ b/manifests/storage/account.pp
+@@ -1,24 +1,36 @@
+ class swift::storage::account(
++ $manage_service = true,
++ $enabled = true,
+ $package_ensure = 'present'
+ ) {
+ swift::storage::generic { 'account':
++ manage_service => $manage_service,
++ enabled => $enabled,
+ package_ensure => $package_ensure,
+ }
+
+ include swift::params
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ service { 'swift-account-reaper':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::account_reaper_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-account'],
+ }
+
+ service { 'swift-account-auditor':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::account_auditor_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-account'],
+ }
+diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
+index a4002d8..23d28ac 100644
+--- a/manifests/storage/container.pp
++++ b/manifests/storage/container.pp
+@@ -5,27 +5,39 @@
+ # field for containers. Defaults to one entry list '127.0.0.1'.
+ #
+ class swift::storage::container(
+- $package_ensure = 'present',
++ $manage_service = true,
++ $enabled = true,
++ $package_ensure = 'present',
+ $allowed_sync_hosts = ['127.0.0.1'],
+ ) {
+ swift::storage::generic { 'container':
++ manage_service => $manage_service,
++ enabled => $enabled,
+ package_ensure => $package_ensure
+ }
+
+ include swift::params
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ service { 'swift-container-updater':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::container_updater_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-container'],
+ }
+
+ service { 'swift-container-auditor':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::container_auditor_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-container'],
+ }
+@@ -41,8 +53,8 @@ class swift::storage::container(
+ target => '/lib/init/upstart-job',
+ }
+ service { 'swift-container-sync':
+- ensure => running,
+- enable => true,
++ ensure => $service_ensure,
++ enable => $enabled,
+ 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
+index 2f84f2e..89eb6fe 100644
+--- a/manifests/storage/generic.pp
++++ b/manifests/storage/generic.pp
+@@ -18,6 +18,8 @@
+ #
+ # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
+ define swift::storage::generic(
++ $manage_service = true,
++ $enabled = true,
+ $package_ensure = 'present',
+ $service_provider = $::swift::params::service_provider
+ ) {
+@@ -42,19 +44,27 @@ define swift::storage::generic(
+ group => 'swift',
+ }
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ service { "swift-${name}":
+- ensure => running,
++ ensure => $service_ensure,
+ name => inline_template("<%= scope.lookupvar('::swift::params::${name}_service_name') %>"),
+- enable => true,
++ enable => $enabled,
+ hasstatus => true,
+ provider => $service_provider,
+ subscribe => Package["swift-${name}"],
+ }
+
+ service { "swift-${name}-replicator":
+- ensure => running,
++ ensure => $service_ensure,
+ name => inline_template("<%= scope.lookupvar('::swift::params::${name}_replicator_service_name') %>"),
+- enable => true,
++ enable => $enabled,
+ hasstatus => true,
+ provider => $service_provider,
+ subscribe => Package["swift-${name}"],
+diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp
+index 1e49101..c26d246 100644
+--- a/manifests/storage/object.pp
++++ b/manifests/storage/object.pp
+@@ -1,24 +1,36 @@
+ class swift::storage::object(
++ $manage_service = true,
++ $enabled = true,
+ $package_ensure = 'present'
+ ) {
+ swift::storage::generic { 'object':
++ manage_service => $manage_service,
++ enabled => $enabled,
+ package_ensure => $package_ensure
+ }
+
+ include swift::params
+
++ if $manage_service {
++ if $enabled {
++ $service_ensure = 'running'
++ } else {
++ $service_ensure = 'stopped'
++ }
++ }
++
+ service { 'swift-object-updater':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::object_updater_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-object'],
+ }
+
+ service { 'swift-object-auditor':
+- ensure => running,
++ ensure => $service_ensure,
+ name => $::swift::params::object_auditor_service_name,
+- enable => true,
++ enable => $enabled,
+ provider => $::swift::params::service_provider,
+ require => Package['swift-object'],
+ }
+--
+1.9.3
+
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 9ff1b89..40f16a5 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,47 +1,48 @@
-%global apache_commit bbf9278b24931444022aa67140d3505b748151da
-%global ceilometer_commit c2f41fb1eb776bcfdaab79c120ac509a861d0828
-%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
-%global cinder_commit 57da044279780af66479c429e5803825a87b785e
-%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
-%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
-%global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5
-%global galera_commit 3f63bd5ffdd707b42ef37a0ead3c2cf7e803586f
-%global glance_commit cb0daf02d7a991be642e62294912d93b036c6a5a
-%global gluster_commit 80c2b13448c97c70a4b4bc0e402e00ecb5d681d5
-%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
-%global heat_commit 17736b2fd726858cb83590f8a8b1d594a087ea44
-%global horizon_commit bd1c31e87dd0564a8fab8de0516dbbe48241b09a
-%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
-%global keystone_commit e61e4c2ab5c67150237e59dab25679ec739d3ebf
-%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
-%global module_data_commit 159fc5e0e21ce9df96c777f0064b5eca88e29cae
-%global mongodb_commit 3f392925710f1758a95f1775d700b5fb787a003d
-%global mysql_commit 8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f
-%global neutron_commit d7ea12e36542204ed737d3514e2f05f2846fd330
-%global nova_commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c
-%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
-%global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951
-%global pacemaker_commit 0ed9ee8a29c0f27e86727d415b39d2715332df7d
-%global puppet_commit 07ec49d1f67a498b31b4f164678a76c464e129c4
-%global qpid_commit 1f0c32b39ad17e7acbd440b50fb6f0875971f5e1
-%global rabbitmq_commit e7447851a60a419cd51a09ccf807964b36fdebac
-%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
-%global sahara_commit f4e5681cfb289113be1ba49c12709145ecbad938
-%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
-%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
-%global stdlib_commit 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
-%global swift_commit 80ec3a7576efad5e13d37a8c760ed0ad7f36055f
-%global sysctl_commit c4486acc2d66de857dbccd8b4b945ea803226705
-%global tempest_commit 792be887b61ad9c38706e968a21752cfb05c2381
-%global vcsrepo_commit 6f7507a2a48ff0a58c7db026760a2eb84e382a77
-%global vlan_commit c937de75c28e63fba8d8738ad6a5f2ede517e53d
-%global vswitch_commit a20f6355f048d2cb6206222b2d045b41ac875db4
-%global xinetd_commit 6b02de8d4f30a819eb404048e4258e3a5e8023c8
+%global apache_commit bbf9278b24931444022aa67140d3505b748151da
+%global ceilometer_commit c2f41fb1eb776bcfdaab79c120ac509a861d0828
+%global certmonger_commit 5fbf10fbbff4aed4db30e839c63c99b195e8425a
+%global cinder_commit 57da044279780af66479c429e5803825a87b785e
+%global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9
+%global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0
+%global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5
+%global galera_commit e35922bbb31ef2e6a86c7973cbafea96a8b160af
+%global glance_commit cb0daf02d7a991be642e62294912d93b036c6a5a
+%global gluster_commit 80c2b13448c97c70a4b4bc0e402e00ecb5d681d5
+%global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79
+%global heat_commit 17736b2fd726858cb83590f8a8b1d594a087ea44
+%global horizon_commit bd1c31e87dd0564a8fab8de0516dbbe48241b09a
+%global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1
+%global keystone_commit e61e4c2ab5c67150237e59dab25679ec739d3ebf
+%global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7
+%global module_data_commit 159fc5e0e21ce9df96c777f0064b5eca88e29cae
+%global mongodb_commit 3f392925710f1758a95f1775d700b5fb787a003d
+%global mysql_commit 8d5fed32c22c5e4231d5a475cfe8060ce8b2ed0f
+%global neutron_commit d7ea12e36542204ed737d3514e2f05f2846fd330
+%global nova_commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c
+%global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a
+%global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951
+%global pacemaker_commit 0ed9ee8a29c0f27e86727d415b39d2715332df7d
+%global puppet_commit 07ec49d1f67a498b31b4f164678a76c464e129c4
+%global qpid_commit 1f0c32b39ad17e7acbd440b50fb6f0875971f5e1
+%global rabbitmq_commit e7447851a60a419cd51a09ccf807964b36fdebac
+%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
+%global sahara_commit f4e5681cfb289113be1ba49c12709145ecbad938
+%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
+%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
+%global stdlib_commit 62e8c1d76902e6f22cb9f7b3abd43e757b4130a3
+%global swift_commit 80ec3a7576efad5e13d37a8c760ed0ad7f36055f
+%global sysctl_commit c4486acc2d66de857dbccd8b4b945ea803226705
+%global tempest_commit 792be887b61ad9c38706e968a21752cfb05c2381
+%global vcsrepo_commit 6f7507a2a48ff0a58c7db026760a2eb84e382a77
+%global vlan_commit c937de75c28e63fba8d8738ad6a5f2ede517e53d
+%global vswitch_commit a20f6355f048d2cb6206222b2d045b41ac875db4
+%global xinetd_commit 6b02de8d4f30a819eb404048e4258e3a5e8023c8
+
Name: openstack-puppet-modules
Version: 2014.1
-Release: 20.1%{?dist}
+Release: 21%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -63,7 +64,7 @@ Source12: https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}
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
+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
@@ -110,6 +111,15 @@ 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
+
BuildArch: noarch
Requires: rubygem-json
@@ -163,6 +173,7 @@ A collection of Puppet modules used to install and configure OpenStack.
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}
@@ -171,10 +182,12 @@ cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
%patch103 -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}
@@ -191,6 +204,7 @@ cd %{_builddir}/%{name}-%{version}/puppet-neutron-%{neutron_commit}
%patch110 -p1
%patch115 -p1
%patch117 -p1
+%patch124 -p1
# puppet-vswitch patches
cd %{_builddir}/%{name}-%{version}/puppet-vswitch-%{vswitch_commit}
@@ -206,6 +220,23 @@ cd %{_builddir}/%{name}-%{version}/puppetlabs-rabbitmq-%{rabbitmq_commit}
cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit}
%patch112 -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
+
+
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 {} +
@@ -267,6 +298,19 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Wed Sep 03 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-21
+- Updated to #20 0001-Refacfored-a-more-suitable-ovs_redhat-provider.patch
+ (rhbz#1133446)
+- Added 0001-vlan-is-not-the-same-as-vlan_start.patch (rhbz#1135079)
+- Added manage_service-neutron.patch (rhbz#1134000)
+- Updated puppet-galera module (rhbz#1129397)
+- Added manage_service-ceilometer.patch (rhbz#1129410)
+- Added manage_service-heat.patch (rhbz#1129407)
+- Added manage_service-horizon.patch (rhbz#1129408)
+- Added manage_service-keystone.patch (rhbz#1129399)
+- Added manage_service-swift.patch (rhbz#1129409)
+- Added manage_service-glance.patch (rhbz#1129404)
+
* Mon Aug 18 2014 Iván Chavero <ichavero at redhat.com> - 2014.1-20.1
- Added missing patches
@@ -296,7 +340,7 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
- Add 0001-Install-ceph-client-libraries-when-using-rbd.patch
- Add 0001-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
-* Wed Jun 26 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-18
+* Thu Jun 26 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-18
- Updated modules to redhat-openstack/openstack-puppet-modules-2014.1-18
- Added 0001-Refresh-Neutron-server.patch (rhbz#1110281)
- Added rabbitmq-repo-manage.patch (rhbz#1112853)
diff --git a/sources b/sources
index f52fbdc..459c8fc 100644
--- a/sources
+++ b/sources
@@ -37,3 +37,4 @@ ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a
203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz
d0808da5ad0ac1227a2d2d78ff66a9b1 vswitch-a20f6355f048d2cb6206222b2d045b41ac875db4.tar.gz
da027803b368c3790ad8421ce8c3a3ac pacemaker-0ed9ee8a29c0f27e86727d415b39d2715332df7d.tar.gz
+6aaf62820b0c206be54c0a792bc58d5a galera-e35922bbb31ef2e6a86c7973cbafea96a8b160af.tar.gz
More information about the scm-commits
mailing list