Hello community,

here is the log from the commit of package openstack-suse for openSUSE:Factory 
checked in at 2014-04-09 19:09:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-suse (Old)
 and      /work/SRC/openSUSE:Factory/.openstack-suse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openstack-suse"

Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-suse/openstack-suse.changes    
2014-01-23 15:50:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-suse.new/openstack-suse.changes       
2014-04-09 19:09:35.000000000 +0200
@@ -1,0 +2,26 @@
+Wed Apr  2 13:22:52 UTC 2014 - dmuel...@suse.com
+
+- remove yet another case of magic sed'ing that breaks OpenStack (bnc#871199) 
+
+-------------------------------------------------------------------
+Mon Mar 24 10:50:02 UTC 2014 - dmuel...@suse.com
+
+- add optional support for -u, -g and -s in creating openstack users 
+
+-------------------------------------------------------------------
+Wed Feb 19 16:00:15 UTC 2014 - dmuel...@suse.com
+
+- add macro for creating openstack users (and removing the non-prefixed
+  variants)
+
+-------------------------------------------------------------------
+Thu Feb  6 16:34:52 UTC 2014 - dmuel...@suse.com
+
+- raise version to 2014.1 
+
+-------------------------------------------------------------------
+Tue Feb  4 16:28:46 UTC 2014 - speili...@suse.com
+
+- Drop eventlet_backdoor.py and it's sole usage in oslo-incubator code 
(bnc#847189#c9)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openstack-suse.spec ++++++
--- /var/tmp/diff_new_pack.bANMir/_old  2014-04-09 19:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.bANMir/_new  2014-04-09 19:09:36.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           openstack-suse
-Version:        2013.2
+Version:        2014.1
 Release:        0
 Summary:        OpenStack SUSE
 License:        Apache-2.0

++++++ macros.openstack ++++++
--- /var/tmp/diff_new_pack.bANMir/_old  2014-04-09 19:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.bANMir/_new  2014-04-09 19:09:36.000000000 +0200
@@ -3,14 +3,12 @@
 # Copyright: (c) 2012 SUSE Linux Products GmbH
 
 # Cleanup unnecessary files, avoid usage of 'git' to generate timestamps and
-# do not use intersphinx module, it requires internet access and fix 
-# non-executable scripts in Python module paths (sitelib/sitearch):
+# do not use intersphinx module as it requires internet access:
 %openstack_cleanup_prep() \
 find . -name "*.placeholder" -delete -print \
 find . -name "*.git*" -delete -print \
 sed -i -e "s|html_last_updated_fmt = .*|html_last_updated_fmt = '%{version}'|" 
doc/source/conf.py || : \
 sed -i -e "s|'sphinx.ext.intersphinx',\\?||" doc/source/conf.py || : \
-find %{component} -type f -exec sed -i "s|^#!.*||" {} \\; \
 sed -i -e "/^\\[testenv\\]/ a\\sitepackages = True" tox.ini \
 # We use obs-service-git_tarballs, thus we don't need to depend on 
python-setuptools-git: \
 sed -i -e "s|'setuptools[-_]git.*'||" setup.py \
@@ -28,6 +26,35 @@
 rm -r doc/source-man doc/build/man/.doctrees \
 %nil
 
+# Create given user with given group (to be used as %pre scriptlet for
+# openstack related daemons). Also migrates away from openstack- prefixed
+# users/group if it exists
+# Optional:
+#   -u userid to pick
+#   -g groupid to pick
+#   -s shell to pick
+# Example: openstack_pre_user_group_create keystone keystone
+
+%openstack_pre_user_group_create(u:g:s:) \
+    # Migrate away from old openstack- prefix \
+    oldu=$(getent passwd openstack-%1 |cut -d: -f3) || : \
+    [ -n "$oldu" ] && { \
+        oldu="-o -u $oldu"   \
+        userdel openstack-%1  \
+    } \
+    getent group %2 >/dev/null || { \
+        # Migrate away from old openstack- prefix \
+        oldg=$(getent group openstack-%2 |cut -d: -f3) || : \
+        [ -n "$oldg" ] && oldg="-o -g $oldg" \
+        [ -n "$oldg" ] && groupdel openstack-%2 || : \
+        [ -z "$oldg" ] && oldg="%{-g:-g %{-g*}}" \
+        groupadd -r %2 $oldg \
+    } \
+    [ -z "$oldu" ] && oldu="%{-u:-u %{-u*}}" \
+    getent passwd %1 >/dev/null || { \
+        useradd -r -g %2 $oldu -d %{_localstatedir}/lib/%1 %{-s:-s 
%{-s*}}%{!-s: -s /sbin/nologin} -c "OpenStack %1 Daemon" %1 \
+    } \
+%nil
 
 # Installing init scripts is always done the same way. Arguments:
 #  1) daemon name (lowercase, e.g. 'api' for 'nova-api')
@@ -46,15 +73,21 @@
 ln -s ../..%{_initddir}/openstack-%{component}-%1 
%{buildroot}%{_sbindir}/rcopenstack-%{component}-%1 \
 %nil
 
+
 %openstack_test_package_buildroot_dir 
%{buildroot}%{_localstatedir}/lib/%{name}-test
 
 # Installing a test package is always done the same way:
 %openstack_test_package_install() \
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}-test \
+install -d -m 755 %{openstack_test_package_buildroot_dir} \
 # Some packages differ here, try to install as much as possible: \
-cp -av README.md README.rst PKG-INFO .testr.conf .*tests bin etc examples 
manage.py openstack_dashboard run_tests.* setup.cfg setup.py smoketests static 
test tests tools tox.ini %{buildroot}%{_localstatedir}/lib/%{name}-test || : \
-rm -rf %{buildroot}%{_localstatedir}/lib/%{name}-test/%{component} \
-ln -s %{python_sitelib}/%{component} 
%{buildroot}%{_localstatedir}/lib/%{name}-test/%{component} \
+cp -av \\\
+       README.md README.rst PKG-INFO .testr.conf .*tests bin \\\
+       etc examples manage.py openstack_dashboard run_tests.* \\\
+       setup.cfg setup.py smoketests static test tests tools \\\
+       tox.ini \\\
+   %{openstack_test_package_buildroot_dir} || : \
+rm -rf %{openstack_test_package_buildroot_dir}/%{component} \
+ln -s %{python_sitelib}/%{component} 
%{openstack_test_package_buildroot_dir}/%{component} \
 %nil
 
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to