[openstack-packstack/icehouse-epel7] Updated to packstack-2014.1.1dev1067

[Martin Mágr]

commit 02985a1be3c1cf87afd6b561d9bd261c1bc2f414
Author: Martin Magr <mmagr at redhat.com>
Date:   Mon May 12 19:13:26 2014 +0200

    Updated to packstack-2014.1.1dev1067
    
    Conflicts:
    	openstack-packstack.spec

 .gitignore                                         |    1 +
 ...for-stoped-openstack-ceilometer-notificat.patch |   35 ++++++++++++++++++++
 openstack-packstack.spec                           |   20 ++++++++---
 sources                                            |    2 +-
 4 files changed, 51 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d809ec..534e60c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
 /packstack-2014.1.1dev1045.tar.gz
 /packstack-2014.1.1dev1055.tar.gz
 /packstack-2014.1.1dev1065.tar.gz
+/packstack-2014.1.1dev1067.tar.gz
diff --git a/0001-Workaround-for-stoped-openstack-ceilometer-notificat.patch b/0001-Workaround-for-stoped-openstack-ceilometer-notificat.patch
new file mode 100644
index 0000000..2d77452
--- /dev/null
+++ b/0001-Workaround-for-stoped-openstack-ceilometer-notificat.patch
@@ -0,0 +1,35 @@
+From f3e5fd2db09ff5dc4439fb26c18389d91b525d64 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Mon, 12 May 2014 15:44:36 +0200
+Subject: [PATCH] Workaround for stoped openstack-ceilometer-notification
+ service
+
+This service has to run to have Ceilometer funtional. This is only
+a workaround quickfix. Module puppet-ceilometer and appropriate
+manifest templates will have to be updated to fix this issue completely.
+
+Change-Id: Iee03c5042d01af00b027b564de70df458852656b
+Fixes: rhbz#1096268
+---
+ packstack/puppet/templates/ceilometer.pp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/packstack/puppet/templates/ceilometer.pp b/packstack/puppet/templates/ceilometer.pp
+index 7bf6766..5b12dbc 100644
+--- a/packstack/puppet/templates/ceilometer.pp
++++ b/packstack/puppet/templates/ceilometer.pp
+@@ -5,6 +5,11 @@ class { 'ceilometer::db':
+ class { 'ceilometer::collector':
+ }
+ 
++service { 'openstack-ceilometer-notification':
++  ensure => 'running',
++  require => Class['ceilometer::collector'],
++}
++
+ class { 'ceilometer::agent::auth':
+     auth_url      => 'http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0',
+     auth_password => '%(CONFIG_CEILOMETER_KS_PW)s',
+-- 
+1.8.5.3
+
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 525f6a4..22c13d0 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -1,12 +1,12 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-%global git_revno 1065
+%global git_revno 1067
 
 
 # openstack-packstack ----------------------------------------------------------
 
 Name:           openstack-packstack
 Version:        2014.1.1
-Release:        0.12.dev%{git_revno}%{?dist}
+Release:        0.13.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -14,11 +14,13 @@ License:        ASL 2.0 and GPLv2
 URL:            https://github.com/stackforge/packstack
 # Tarball is created by bin/release.sh
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
+
 Patch0:         el7-prescript.patch
 Patch1:         enable-epel.patch
 Patch2:         epel-releasever.patch
 Patch3:         disable-nagios.patch
 Patch4:         el7-swift.patch
+Patch5:         0001-Workaround-for-stoped-openstack-ceilometer-notificat.patch
 
 BuildArch:      noarch
 
@@ -73,6 +75,7 @@ This package contains documentation files for Packstack.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -144,16 +147,21 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Mon May 12 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.13.dev1067
+- Ensure sshkey title is unique
+- Install ceilometer compute agent on nova-cpu nodes (lp#1318383)
+- Added 0001-Workaround-for-stoped-openstack-ceilometer-notificat.patch
+
 * Fri May 9 2014 Iván Chavero <ichavero at redhat.com> - 2014.1.1-0.12.dev1065
-- Install o-p-m dependencies on all nodes 
+- Install o-p-m dependencies on all nodes
 - [vCenter] Fix the parameters duplicated in answer file (rhbz#1061372, rhbz#1092008)
 - Set correct keystone_default_role for Horizon
-- Better localhost checking for SSL configuration 
+- Better localhost checking for SSL configuration
 - Add hostname to SSL redirection (rhbz#1078130)
-- Introduce support for mocking command output 
+- Introduce support for mocking command output
 - [Horizon] Fixed help_url to point to upstream docs (rhbz#1080917)
 - Support ssh-based live migration (lp#1311168)
-- Introduce support for mocking command output 
+- Introduce support for mocking command output
 
 * Wed Apr 30 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.11.dev1055
 - Redirect to https port when SSL enabled (rhbz#1078130)
diff --git a/sources b/sources
index ff9acd1..8f014a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d5ee86a4bb5812ab4b8280656efed6b  packstack-2014.1.1dev1065.tar.gz
+642d18f82618d16d5bb6370ba2fbe56f  packstack-2014.1.1dev1067.tar.gz