Fix requires and add group openstack-heat transition

changed require from python-paste to python-paste-deploy (rhbz#963207)

changed UID/GID back again to heat instead of openstack-heat
added group/user rename for old installs
changed systemd scripts to match heat user

Resolves: rhbz#963207

heat-api-cfn.service

@@ -6,7 +6,7 @@ Requires=syslog.target network.target heat-engine.service
 [Service]
 ExecStart=/usr/bin/heat-api-cfn
 Restart=on-failure
-User=openstack-heat
+User=heat
 
 [Install]
 WantedBy=multi-user.target

heat-api-cloudwatch.service

@@ -6,7 +6,7 @@ Requires=syslog.target network.target heat-engine.service
 [Service]
 ExecStart=/usr/bin/heat-api-cloudwatch
 Restart=on-failure
-User=openstack-heat
+User=heat
 
 [Install]
 WantedBy=multi-user.target

heat-api.service

@@ -6,7 +6,7 @@ Requires=syslog.target network.target heat-engine.service
 [Service]
 ExecStart=/usr/bin/heat-api
 Restart=on-failure
-User=openstack-heat
+User=heat
 
 [Install]
 WantedBy=multi-user.target

heat-engine.service

@@ -6,7 +6,7 @@ Requires=syslog.target network.target qpidd.service mysqld.service openstack-key
 [Service]
 ExecStart=/usr/bin/heat-engine
 Restart=on-failure
-User=openstack-heat
+User=heat
 
 [Install]
 WantedBy=multi-user.target

heat-metadata.service

@@ -6,7 +6,7 @@ Requires=syslog.target network.target heat-engine.service
 [Service]
 ExecStart=/usr/bin/heat-metadata
 Restart=on-failure
-User=openstack-heat
+User=heat
 
 [Install]
 WantedBy=multi-user.target

heat.spec

@@ -1,7 +1,7 @@
 Name: heat
 Summary: This software provides AWS CloudFormation functionality for OpenStack Essex
 Version: 7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: System Environment/Base
 URL: http://heat-api.org
@@ -31,7 +31,7 @@ Requires: python-lxml
 Requires: python-memcached
 Requires: python-migrate
 Requires: python-novaclient
-Requires: python-paste
+Requires: python-paste-deploy
 Requires: python-qpid
 Requires: python-routes
 Requires: pysendfile
@@ -92,28 +92,35 @@ Heat provides AWS CloudFormation and CloudWatch functionality for OpenStack.
 %{_mandir}/man1/*.gz
 %{_bindir}/*
 %{python_sitelib}/heat*
-%dir %attr(0755,openstack-heat,root) %{_localstatedir}/log/heat
-%dir %attr(0755,openstack-heat,root) %{_localstatedir}/lib/heat
+%dir %attr(0755,heat,root) %{_localstatedir}/log/heat
+%dir %attr(0755,heat,root) %{_localstatedir}/lib/heat
 %{_unitdir}/heat*.service
 %dir %{_sysconfdir}/heat
 %config(noreplace) %{_sysconfdir}/logrotate.d/heat
 %config(noreplace) %{_sysconfdir}/bash_completion.d/heat
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api.conf
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-paste.ini
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cfn.conf
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cfn-paste.ini
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cloudwatch.conf
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-api-cloudwatch-paste.ini
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-engine.conf
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-metadata.conf
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/heat-metadata-paste.ini
-%config(noreplace) %attr(-,root,openstack-heat) %{_sysconfdir}/heat/boto.cfg
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api.conf
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-paste.ini
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cfn.conf
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cfn-paste.ini
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cloudwatch.conf
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-api-cloudwatch-paste.ini
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-engine.conf
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-metadata.conf
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/heat-metadata-paste.ini
+%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/boto.cfg
 
 %pre
-getent group openstack-heat >/dev/null || groupadd -r openstack-heat --gid 187
-getent passwd openstack-heat  >/dev/null || \
-useradd -u 187 -r -g openstack-heat -d %{_localstatedir}/lib/heat -s /sbin/nologin \
-    -c "OpenStack Heat Daemon" openstack-heat
+# handle rename from old installs
+getent passwd 187 | cut -f1 -d: | grep -qx "openstack-heat"
+if [ $? -eq 0 ]; then
+    usermod -l heat openstack-heat
+    groupmod -n heat openstack-heat
+fi
+
+getent group heat >/dev/null || groupadd -r heat --gid 187
+getent passwd heat >/dev/null || \
+useradd -u 187 -r -g heat -d %{_localstatedir}/lib/heat -s /sbin/nologin \
+    -c "OpenStack Heat Daemon" heat
 exit 0
 
 %post
@@ -138,6 +145,12 @@ exit 0
 %systemd_postun_with_restart heat-api-cloudwatch.service
 
 %changelog
+* Wed May 29 2013 Jeff Peeler <jpeeler@redhat.com> 7-3
+- changed require from python-paste to python-paste-deploy (rhbz#963207)
+- changed UID/GID back again to heat instead of openstack-heat (rhbz#920348)
+  added group/user rename for old installs
+- changed systemd scripts to match heat user
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild