April 2013 - openSUSE Commits - openSUSE Mailing Lists

commit python-keystoneclient for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package python-keystoneclient for openSUSE:Factory checked in at 2013-04-29 14:17:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keystoneclient (Old) and /work/SRC/openSUSE:Factory/.python-keystoneclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-keystoneclient", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keystoneclient/python-keystoneclient.changes 2013-03-08 09:43:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-keystoneclient.new/python-keystoneclient.changes 2013-04-29 14:17:44.000000000 +0200 @@ -2 +2 @@ -Wed Mar 6 14:01:15 UTC 2013 - vuntz(a)suse.com +Tue Apr 2 09:48:06 UTC 2013 - dmueller(a)suse.com @@ -4,2 +4,165 @@ -- Add compat-newer-requests.patch: take patches from upstream to - allow working with newer versions of python-requests. +- switch to released version of the tarball (0.2.3) + +------------------------------------------------------------------- +Tue Mar 26 13:39:46 UTC 2013 - dmueller(a)suse.com + +- update to 0.2.3.1 + +------------------------------------------------------------------- +Mon Mar 18 10:33:06 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Sun Mar 17 00:05:07 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.79+git.1363478707.d62bbdf: + + Switch to final 1.1.0 oslo.config release + + Make keystone client handle the response code 300. + + Make auth_token lazy load the auth_version. + + Use v2.0 api by default in auth_token middleware + + Retry http_request and json_request failure. + + update v3 domains - remove public/private namespace + + Doc info and other readability improvements + +-------------------------------------------------------------------- +Wed Mar 13 00:06:33 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.67+git.1363133193.d782a99: + + Fix auth-token middleware to understand v3 tokens + +-------------------------------------------------------------------- +Mon Mar 11 10:05:13 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.66+git.1362996313.ae36809: + + Sync memorycache and timeutils from oslo. + + Save test_auth_token_middleware from unlimited recursion + + Work better in server env with no keyrings + + Switch to oslo.config. + + Remove test dep on name of dir (bug 1124283) + + help text improvements + +-------------------------------------------------------------------- +Fri Mar 1 11:40:53 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.56+git.1362138053.3ce3fe8: + + Improve error message for missing endpoint + +-------------------------------------------------------------------- +Sun Feb 24 18:19:42 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.55+git.1361729982.58cb347: + + Added missing unit tests for shell.py + + Implements token expiration handling + + Use oslo-config-2013.1b3 + + Fix selef to self in class. + + Update oslo-config version. + +------------------------------------------------------------------- +Fri Feb 22 11:26:36 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +-------------------------------------------------------------------- +Mon Feb 18 09:50:05 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.46+git.1361181005.21d9952: + + Allow requests up to 0.8 and greater + + Add name arguments to keystone command. + + Fix debug with requests. + + Remove useless import + + Fix how python 2.6 doesn't have assertDictEqual + + If you specify the --debug argument, it doesn't show the body of a POST request. The body (string rep) is at 'data' in the kwargs dict. 'body' was deleted prior to this call. + + Update .coveragerc + + Allow configure auth_token http connect timeout. + + Use install_venv_common.py from oslo. + + sync README with "keystone help" + +------------------------------------------------------------------- +Mon Feb 18 09:49:46 UTC 2013 - dmueller(a)suse.com + +- remove keystoneclient-requests-compat.patch: + * Merged upstream + +-------------------------------------------------------------------- +Mon Feb 11 15:11:44 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.28+git.1360595504.ff24716: + + Mark password config options with secret + + Update requests requirements + + Pin requests module more strictly. + + Treat HTTP code 400 and above as error. + + Fix incomplete sentence in help + +-------------------------------------------------------------------- +Mon Feb 4 12:05:48 UTC 2013 - dmueller(a)suse.com + +- Update to version 0.2.2.21+git.1359979548.92bf8a7: + + fix discrepancies seen in domain and credential, v3 - bug 1109349 +- Remove 0001-Fix-thinko-in-self.middleware.cert_file_missing.patch: + + Merged upstream + +-------------------------------------------------------------------- +Mon Jan 28 09:09:53 UTC 2013 - dmueller(a)suse.com + +- Update to version 0.2.2.16+git.1359364193.1cbda90: + + Fix STALE_TOKEN_DURATION usage + + Factorize endpoint retrieval in access + + Remove useless code + + Restore Python 2.6 compatibility + + Allow request timeout to be specified. + + Remove assertDictEqual for python 2.6 compatibility +- Remove python-2.6-compat-in-tests.patch, + 0001-Restore-Python-2.6-compatibility.patch: Merged upstream + +------------------------------------------------------------------- +Thu Jan 24 16:15:14 UTC 2013 - dmueller(a)suse.com + +- Add python-2.6-compat-in-tests.patch + * fix python 2.6 support (submitted upstream) + +------------------------------------------------------------------- +Tue Jan 22 12:10:41 UTC 2013 - dmueller(a)suse.com + +- Add patches: + * 0001-Fix-thinko-in-self.middleware.cert_file_missing.patch + * 0001-Restore-Python-2.6-compatibility.patch + Fixes keystone middleware with SLE11 + +------------------------------------------------------------------- +Mon Jan 21 12:57:30 UTC 2013 - saschpe(a)suse.de + +- Add keystoneclient-requests-compat.patch and + replace support-requests-version-1.0.0.patch: Forward-compatibility + with requests >= 1.0.0 + +------------------------------------------------------------------- +Thu Jan 17 21:58:32 UTC 2013 - dmueller(a)suse.com + +- add support-requests-version-1.0.0.patch: + support python-requests also >= 1.0.0 + +-------------------------------------------------------------------- +Thu Jan 17 14:12:59 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.2.5+git.1358431979.3dfb843: + + Blueprint memcache-protection: enable memcache value encryption/integrity check + + Make WebOb version specification more flexible + + Warning message is not logged for valid token-less request. + +------------------------------------------------------------------- +Thu Jan 17 14:08:20 UTC 2013 - vuntz(a)suse.com + +- Use version-regexp param for git_tarballs service to avoid + uselessly including the last git commit id twice. + +-------------------------------------------------------------------- +Mon Jan 14 12:23:20 UTC 2013 - saschpe(a)suse.de + +- Update to version 0.2.2.2.g4a232ac+git.1358162600.4a232ac: + + Use os.path to find ~/keystone-signing (bug 1078947) + + Remove iso8601 dep in favor of openstack.common + + Move iso8601 dependency from test- to pip-requires + + Pin requests to >=0.8.8. + + Use testtools instead of unittest for base classes. +- Updated requirements Old: ---- compat-newer-requests.patch python-keystoneclient-master.tar.gz New: ---- python-keystoneclient-0.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keystoneclient.spec ++++++ --- /var/tmp/diff_new_pack.lU7ABC/_old 2013-04-29 14:17:46.000000000 +0200 +++ /var/tmp/diff_new_pack.lU7ABC/_new 2013-04-29 14:17:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-keystoneclient # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,34 +19,30 @@ %define component keystoneclient Name: python-%{component} -Version: 0.2.1.3.gd37a3fb+git.1357543650.d37a3fb +Version: 0.2.3 Release: 0 -License: Apache-2.0 Summary: Openstack Identity (Keystone) API Client -Url: http://launchpad.net/python-keystoneclient +License: Apache-2.0 Group: Development/Languages/Python -Source: python-keystoneclient-master.tar.gz +Url: http://launchpad.net/python-keystoneclient +Source: python-keystoneclient-0.2.3.tar.gz Source2: openstack-keystone.sh -# PATCH-FIX-UPSTREAM compat-newer-requests.patch vuntz(a)suse.com -- Add patches from git to work with more recent versions of python-requests -Patch0: compat-newer-requests.patch BuildRequires: fdupes -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-base BuildRequires: python-distribute # Packages below are only needed for documentation build -BuildRequires: python-Sphinx +BuildRequires: python-Sphinx >= 1.1.2 BuildRequires: python-WebOb BuildRequires: python-argparse -BuildRequires: python-httplib2 -BuildRequires: python-iso8601 +BuildRequires: python-iso8601 >= 0.1.4 BuildRequires: python-prettytable -BuildRequires: python-requests +BuildRequires: python-requests >= 0.8.8 Requires: python >= 2.6.8 # /usr/bin/keystone uses pkg_resources, thus: Requires: python-distribute -Requires: python-httplib2 Requires: python-prettytable -Requires: python-requests +Requires: python-requests >= 0.8.8 Requires: python-simplejson Recommends: python-keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +62,7 @@ (the keystoneclient module), and a command-line tool (keystone). %package doc + Summary: Openstack Identity (Keystone) API Client - Documentation Group: Documentation/HTML Requires: %{name} = %{version} @@ -74,34 +71,33 @@ This package contains documentation files for %{name}. %package test + Summary: Openstack Identity (Keystone) API Client - Testsuite Group: System/Management Requires: %{name} = %{version} Requires: python-coverage +Requires: python-fixtures Requires: python-mock Requires: python-mox Requires: python-nose Requires: python-nose-exclude -#openstack.nose_plugin Requires: python-nosehtmloutput +Requires: python-openstack.nose_plugin Requires: python-pep8 -Requires: python-unittest2 +Requires: python-testtools >= 0.9.22 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n python-keystoneclient-0.2.1.3.gd37a3fb +%setup -q -n python-keystoneclient-0.2.3 %openstack_cleanup_prep # Fix example PKI certs location for testsuite: sed -i "s|python-keystoneclient/examples|python-keystoneclient-test/examples|" tests/test_auth_token_middleware.py -%patch0 -p1 %build python setup.py build python setup.py build_sphinx -# Currently no man pages: -#python setup.py build_sphinx -b man %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-data=%{python_sitelib} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lU7ABC/_old 2013-04-29 14:17:46.000000000 +0200 +++ /var/tmp/diff_new_pack.lU7ABC/_new 2013-04-29 14:17:46.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/python-keystoneclient/python-keystoneclient-m…</param> + <param name="url">http://tarballs.openstack.org/python-keystoneclient/python-keystoneclient-0…</param> <param name="email">cloud-devel(a)suse.de</param> + <param name="plain-version">True</param> </service> </services> ++++++ python-keystoneclient-master.tar.gz -> python-keystoneclient-0.2.3.tar.gz ++++++ ++++ 9748 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-heatclient for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package python-heatclient for openSUSE:Factory checked in at 2013-04-29 14:17:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-heatclient (Old) and /work/SRC/openSUSE:Factory/.python-heatclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-heatclient", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-heatclient/python-heatclient.changes 2013-01-17 10:00:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-heatclient.new/python-heatclient.changes 2013-04-29 14:17:07.000000000 +0200 @@ -0,0 +1,55 @@ +------------------------------------------------------------------- +Mon Mar 18 10:43:21 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Mon Mar 11 10:04:50 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.0+git.1362996290.841ded0: + + Remove warlock from pip-requires as it is not used + +-------------------------------------------------------------------- +Tue Mar 5 16:52:17 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.0+git.1362502337.b6ff6d2: + + Change --disable-rollback option to --enable-rollback + +-------------------------------------------------------------------- +Thu Feb 28 12:53:02 UTC 2013 - saschpe(a)suse.de + +- Update to version 0.2.0+git.1362055982.ec0a708: + + Don't add 'dev' to tag_build + +-------------------------------------------------------------------- +Sun Feb 24 18:19:14 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.0dev+git.1361729954.f1baa75: + + heatclient : correct timeout parameter name + + heatclient : Add --disable-rollback option + +------------------------------------------------------------------- +Fri Feb 22 11:27:01 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +-------------------------------------------------------------------- +Mon Feb 18 09:40:19 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.2.0dev+git.1361180419.84b7969: + + Return the exit code from tox to callers of run_tests.sh + +-------------------------------------------------------------------- +Mon Feb 4 12:04:33 UTC 2013 - dmueller(a)suse.com + +- Update to version 0.2.0dev+git.1359979473.bcaf6c4: + + Add switch to disable token authentication. + + Don't log at all if debugging is not turned on + +-------------------------------------------------------------------- +Mon Jan 14 13:00:00 UTC 2013 - saschpe(a)suse.de + +- Update to version 0.2.0dev+git.1358164800.7f50a72: + + Fixes required for packaging +- Updated requirements + @@ -2 +57 @@ -Wed Jan 9 08:55:36 UTC 2013 - cloud-devel(a)suse.de +Wed Jan 9 08:55:36 UTC 2013 - saschpe(a)suse.de @@ -10 +65 @@ -Wed Dec 19 15:03:10 UTC 2012 - cloud-devel(a)suse.de +Wed Dec 19 15:03:10 UTC 2012 - saschpe(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-heatclient.spec ++++++ --- /var/tmp/diff_new_pack.9U3CgV/_old 2013-04-29 14:17:08.000000000 +0200 +++ /var/tmp/diff_new_pack.9U3CgV/_new 2013-04-29 14:17:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-heatclient # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,25 +19,28 @@ %define component heatclient Name: python-%{component} -Version: 0.1.0.2.gb1b5455+git.1357718178.b1b5455 +Version: 0.2.0 Release: 0 -License: Apache-2.0 Summary: Openstack Orchestration (Heat) API Client -Url: http://launchpad.net/python-heatclient +License: Apache-2.0 Group: Development/Languages/Python +Url: http://launchpad.net/python-heatclient Source: python-heatclient-master.tar.gz -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-base BuildRequires: python-distribute # Documentation build requirements: +BuildRequires: python-Sphinx BuildRequires: python-httplib2 +BuildRequires: python-iso8601 >= 0.1.4 BuildRequires: python-keystoneclient BuildRequires: python-prettytable -BuildRequires: python-Sphinx Requires: python >= 2.6.8 Requires: python-argparse -Requires: python-prettytable >= 0.6 -Requires: python-keystoneclient >= 0.1.2 +Requires: python-httplib2 +Requires: python-iso8601 >= 0.1.4 +Requires: python-keystoneclient >= 0.2 +Requires: python-prettytable >= 0.5 Requires: python-warlock < 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -65,28 +68,26 @@ Requires: python-mox Requires: python-nose Requires: python-nose-exclude +Requires: python-nosehtmloutput Requires: python-nosexcover Requires: python-openstack.nose_plugin -Requires: python-nosehtmloutput -Requires: python-setuptools-git >= 0.4 +Requires: python-pep8 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n python-heatclient-0.1.0.2.gb1b5455 +%setup -q -n python-heatclient-0.2.0 %openstack_cleanup_prep echo %{version} > heatclient/versioninfo %build python setup.py build python setup.py build_sphinx -# Currently no man pages: -#python setup.py build_sphinx -b man rm -rf doc/build/html/{.buildinfo,.doctrees} %install -python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-data=%{python_sitelib} ### test subpackage %openstack_test_package_install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9U3CgV/_old 2013-04-29 14:17:08.000000000 +0200 +++ /var/tmp/diff_new_pack.9U3CgV/_new 2013-04-29 14:17:08.000000000 +0200 @@ -2,5 +2,6 @@ <service name="git_tarballs" mode="disabled"> <param name="url">http://tarballs.openstack.org/python-heatclient/python-heatclient-master.ta…</param> <param name="email">cloud-devel(a)suse.de</param> + <param name="plain-version">True</param> </service> </services> ++++++ python-heatclient-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/.gitignore new/python-heatclient-0.2.0/.gitignore --- old/python-heatclient-0.1.0.2.gb1b5455/.gitignore 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -.coverage -.venv -*,cover -cover -*.pyc -.idea -*.swp -*~ -AUTHORS -build -dist -ChangeLog -run_tests.err.log -.tox -doc/source/api -*.egg -heatclient/versioninfo -python_heatclient.egg-info -*.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/.gitreview new/python-heatclient-0.2.0/.gitreview --- old/python-heatclient-0.1.0.2.gb1b5455/.gitreview 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/.gitreview 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -[gerrit] -host=review.openstack.org -port=29418 -project=openstack/python-heatclient.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/AUTHORS new/python-heatclient-0.2.0/AUTHORS --- old/python-heatclient-0.1.0.2.gb1b5455/AUTHORS 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/AUTHORS 2013-03-18 00:22:42.000000000 +0100 @@ -1,5 +1,9 @@ +Angus Salkeld <asalkeld(a)redhat.com> Dan Radez <dradez(a)redhat.com> +Dirk Mueller <dirk(a)dmllr.de> +Ian Main <imain(a)redhat.com> Jeremy Stanley <fungi(a)yuggoth.org> Monty Taylor <mordred(a)inaugust.com> Steve Baker <sbaker(a)redhat.com> -Steven Dake <sdake(a)redhat.com> \ No newline at end of file +Steven Dake <sdake(a)redhat.com> +Steven Hardy <shardy(a)redhat.com> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/ChangeLog new/python-heatclient-0.2.0/ChangeLog --- old/python-heatclient-0.1.0.2.gb1b5455/ChangeLog 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/ChangeLog 2013-03-18 00:22:42.000000000 +0100 @@ -1,3 +1,171 @@ +commit 3740ae9fcb1ed4dc39796ceccbf0e7000be71002 +Author: Dirk Mueller <dirk(a)dmllr.de> +Date: Fri Mar 15 17:41:41 2013 +0100 + + Allow for prettytable 0.7.x as well + + Relax requirements to >= 0.6, < 0.8, as 0.7.x seems to + work as well. Lower has been raised to 0.6 to match openstack-common/requirements + + Change-Id: Ic8ce818016ae7d9fbfeb1548b612f8d9e8ae7c42 + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 841ded0a5a1c0ed7ef07b7662381d623ded403c4 +Author: Angus Salkeld <asalkeld(a)redhat.com> +Date: Thu Mar 7 15:57:44 2013 +1100 + + Remove warlock from pip-requires as it is not used + + This is a hangover from copying from glanceclient + + Change-Id: Id81035b5432b65e776217f6b3e7e62c4447d4541 + Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com> + + tools/pip-requires | 1 - + 1 file changed, 1 deletion(-) + +commit b6ff6d2eecdaa6840ecadd8bb30a9de1d3dad92b +Author: Steven Hardy <shardy(a)redhat.com> +Date: Mon Mar 4 15:53:15 2013 +0000 + + Change --disable-rollback option to --enable-rollback + + Due to bug 1131303, the engine default is changing to disable + rollback by default, so we instead need an option to allow + users to enable this functionality + + fixes bug 1144630 + + Change-Id: I509e616e20a3e4750ffcefe6e72c52e5f60445bc + + heatclient/v1/shell.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit ec0a708c998656c1500897436cdcf3bb2a42f2b4 +Author: Steve Baker <sbaker(a)redhat.com> +Date: Wed Feb 27 10:28:30 2013 +1300 + + Don't add 'dev' to tag_build + + Change-Id: I3b37b4bf29fab29ffcb471b7f9f4707c8d5882fe + + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1baa757c38c21dfb4f6ac43670257729f958200 +Author: Steven Hardy <shardy(a)redhat.com> +Date: Mon Feb 18 15:07:21 2013 +0000 + + heatclient : Add --disable-rollback option + + Adds -D/--disable-rollback option to align with new heat-cfn + option + + Change-Id: I4a997df0b63d19a25f2047710809a80520187f9f + Signed-off-by: Steven Hardy <shardy(a)redhat.com> + + heatclient/v1/shell.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 776f25099e90d31d05e28eb7f6fdc69b63d74478 +Author: Steven Hardy <shardy(a)redhat.com> +Date: Mon Feb 18 13:54:42 2013 +0000 + + heatclient : correct timeout parameter name + + The timeout parameter needs to be timeout_mins to match the + engine API or the parameter will not be recognized by the + engine. + + fixes bug 1129348 + + Change-Id: I489364a2abed376f35bf2da24915db30c982e61b + Signed-off-by: Steven Hardy <shardy(a)redhat.com> + + heatclient/v1/shell.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 84b7969b72af218f948078eb8ee46a97783f24de +Author: Dirk Mueller <dirk(a)dmllr.de> +Date: Mon Feb 11 18:01:27 2013 +0100 + + Return the exit code from tox to callers of run_tests.sh + + Invoking PIPESTATUS appears to be volatile in my environment, + after the if condition it is already again 0, even if it was + non-zero before. Capture the result permanently in a variable + and use that one consistently. + + Also handle the just-pep8 case correctly. + + Change-Id: Icca8c00c8d2189da1a133db277c9071c2d6c880b + + run_tests.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit bcaf6c4d9327a221091302fea807860ae538994c +Author: Ian Main <imain(a)redhat.com> +Date: Thu Jan 31 15:42:24 2013 -0800 + + Add switch to disable token authentication. + + This patch allows you to disable token authentication with keystone so + that the client can be used with other backends in heat. + + Change-Id: I4b35df82a782ddbc8532e85a7b9d532b327d010a + Signed-off-by: Ian Main <imain(a)redhat.com> + + heatclient/common/http.py | 3 +++ + heatclient/shell.py | 35 +++++++++++++++++++++++------------ + 2 files changed, 26 insertions(+), 12 deletions(-) + +commit 8f268e44cdc8b8a434aa510a1c389793a1ea2872 +Author: Angus Salkeld <asalkeld(a)redhat.com> +Date: Fri Jan 25 12:03:01 2013 +1100 + + Don't log at all if debugging is not turned on + + Else the http module prints this out on each command - yuk + + "INFO Starting new HTTP connection (1): 127.0.0.1" + + Change-Id: I6e8900106051914b7ddc0a216c6a7864f4ea38e0 + + heatclient/shell.py | 4 ---- + 1 file changed, 4 deletions(-) + +commit 7f50a72aacd9e48ef682037ab11f372a52cc838a +Author: Steve Baker <sbaker(a)redhat.com> +Date: Thu Jan 10 11:07:06 2013 +1300 + + Fixes required for packaging + + - Add versioninfo to the data_files + - Excludes for MANIFEST.in + + Part of blueprint rpm-package + Change-Id: Ia629c9e08d070785d8ee0984913e62064e94ebb4 + + MANIFEST.in | 5 +++-- + setup.py | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 706cbdb57b2ed9cca29f04db0cc3700f7a04f985 +Merge: 15be62b bc972b2 +Author: Jenkins <jenkins(a)review.openstack.org> +Date: Wed Jan 9 20:01:11 2013 +0000 + + Merge "Switch to using version.canonical_version_string" + +commit 15be62b7f78c70829edd464cb0d209572aa040ce +Merge: b1b5455 712e172 +Author: Jenkins <jenkins(a)review.openstack.org> +Date: Wed Jan 9 20:00:28 2013 +0000 + + Merge "Update to latest oslo-incubator" + commit b1b545581dc7bec76ffb5a23a0c6fac6111e492f Author: Steve Baker <sbaker(a)redhat.com> Date: Wed Jan 9 10:51:40 2013 +1300 @@ -13,6 +181,35 @@ tools/pip-requires | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) +commit bc972b214ee03d2b04ae9fe099e3ad59fd735b4b +Author: Steve Baker <sbaker(a)redhat.com> +Date: Fri Jan 4 16:53:10 2013 +1300 + + Switch to using version.canonical_version_string + + Change-Id: Id095c61325b0d64bc77b742abf72958aeb4cde4d + + heatclient/version.py | 3 +++ + setup.cfg | 5 +++++ + setup.py | 5 ++++- + 3 files changed, 12 insertions(+), 1 deletion(-) + +commit 712e1726adcf30f48df3f855c14c2a5e80657dbe +Author: Steve Baker <sbaker(a)redhat.com> +Date: Fri Jan 4 16:58:11 2013 +1300 + + Update to latest oslo-incubator + + The included changes to version.py are required for + correctly generating the versioninfo file. + + Change-Id: I3534f4de099dc6d7462d896e9b18a8f776ee4daf + + heatclient/openstack/common/importutils.py | 2 +- + heatclient/openstack/common/setup.py | 46 +++++++++++++++++++--------- + heatclient/openstack/common/version.py | 37 +++++++++------------- + 3 files changed, 46 insertions(+), 39 deletions(-) + commit c7130de0a979c8adb32fd52efd41ae05456d9d55 Author: Steve Baker <sbaker(a)redhat.com> Date: Tue Dec 11 13:48:55 2012 +1300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/MANIFEST.in new/python-heatclient-0.2.0/MANIFEST.in --- old/python-heatclient-0.1.0.2.gb1b5455/MANIFEST.in 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/MANIFEST.in 2013-03-18 00:21:09.000000000 +0100 @@ -1,10 +1,11 @@ include AUTHORS -include HACKING include LICENSE -include README.rst +include README.md include ChangeLog include tox.ini include heatclient/versioninfo recursive-include doc * recursive-include tests * recursive-include tools * +exclude .gitignore +exclude .gitreview diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/PKG-INFO new/python-heatclient-0.2.0/PKG-INFO --- old/python-heatclient-0.1.0.2.gb1b5455/PKG-INFO 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/PKG-INFO 2013-03-18 00:22:43.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-heatclient -Version: 0.1.0.2.gb1b5455 +Version: 0.2.0 Summary: Client library for Heat orchestration API Home-page: https://github.com/openstack/python-heatclient Author: Heat API Developers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/common/http.py new/python-heatclient-0.2.0/heatclient/common/http.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/common/http.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/common/http.py 2013-03-18 00:21:09.000000000 +0100 @@ -50,6 +50,7 @@ def __init__(self, endpoint, **kwargs): self.endpoint = endpoint + self.auth_url = kwargs.get('auth_url') self.auth_token = kwargs.get('token') self.username = kwargs.get('username') self.password = kwargs.get('password') @@ -131,6 +132,8 @@ kwargs['headers'].setdefault('User-Agent', USER_AGENT) if self.auth_token: kwargs['headers'].setdefault('X-Auth-Token', self.auth_token) + if self.auth_url: + kwargs['headers'].setdefault('X-Auth-Url', self.auth_url) if self.username: kwargs['headers'].setdefault('X-Auth-User', self.username) if self.password: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/importutils.py new/python-heatclient-0.2.0/heatclient/openstack/common/importutils.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/importutils.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/openstack/common/importutils.py 2013-03-18 00:21:09.000000000 +0100 @@ -29,7 +29,7 @@ try: __import__(mod_str) return getattr(sys.modules[mod_str], class_str) - except (ValueError, AttributeError), exc: + except (ValueError, AttributeError): raise ImportError('Class %s cannot be found (%s)' % (class_str, traceback.format_exception(*sys.exc_info()))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/setup.py new/python-heatclient-0.2.0/heatclient/openstack/common/setup.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/setup.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/openstack/common/setup.py 2013-03-18 00:21:09.000000000 +0100 @@ -31,13 +31,13 @@ def parse_mailmap(mailmap='.mailmap'): mapping = {} if os.path.exists(mailmap): - fp = open(mailmap, 'r') - for l in fp: - l = l.strip() - if not l.startswith('#') and ' ' in l: - canonical_email, alias = [x for x in l.split(' ') - if x.startswith('<')] - mapping[alias] = canonical_email + with open(mailmap, 'r') as fp: + for l in fp: + l = l.strip() + if not l.startswith('#') and ' ' in l: + canonical_email, alias = [x for x in l.split(' ') + if x.startswith('<')] + mapping[alias] = canonical_email return mapping @@ -54,7 +54,8 @@ def get_reqs_from_files(requirements_files): for requirements_file in requirements_files: if os.path.exists(requirements_file): - return open(requirements_file, 'r').read().split('\n') + with open(requirements_file, 'r') as fil: + return fil.read().split('\n') return [] @@ -116,8 +117,12 @@ def _run_shell_command(cmd): - output = subprocess.Popen(["/bin/sh", "-c", cmd], - stdout=subprocess.PIPE) + if os.name == 'nt': + output = subprocess.Popen(["cmd.exe", "/C", cmd], + stdout=subprocess.PIPE) + else: + output = subprocess.Popen(["/bin/sh", "-c", cmd], + stdout=subprocess.PIPE) out = output.communicate() if len(out) == 0: return None @@ -135,15 +140,17 @@ _run_shell_command("git fetch origin +refs/meta/*:refs/remotes/meta/*") milestone_cmd = "git show meta/openstack/release:%s" % branch_name milestonever = _run_shell_command(milestone_cmd) - if not milestonever: - milestonever = "" + if milestonever: + first_half = "%s~%s" % (milestonever, datestamp) + else: + first_half = datestamp + post_version = _get_git_post_version() # post version should look like: # 0.1.1.4.gcc9e28a # where the bit after the last . is the short sha, and the bit between # the last and second to last is the revno count (revno, sha) = post_version.split(".")[-2:] - first_half = "%s~%s" % (milestonever, datestamp) second_half = "%s%s.%s" % (revno_prefix, revno, sha) return ".".join((first_half, second_half)) @@ -236,7 +243,8 @@ def write_versioninfo(project, version): """Write a simple file containing the version of the package.""" - open(os.path.join(project, 'versioninfo'), 'w').write("%s\n" % version) + with open(os.path.join(project, 'versioninfo'), 'w') as fil: + fil.write("%s\n" % version) def get_cmdclass(): @@ -268,6 +276,9 @@ from sphinx.setup_command import BuildDoc class LocalBuildDoc(BuildDoc): + + builders = ['html', 'man'] + def generate_autoindex(self): print "**Autodocumenting from %s" % os.path.abspath(os.curdir) modules = {} @@ -303,14 +314,19 @@ if not os.getenv('SPHINX_DEBUG'): self.generate_autoindex() - for builder in ['html', 'man']: + for builder in self.builders: self.builder = builder self.finalize_options() self.project = self.distribution.get_name() self.version = self.distribution.get_version() self.release = self.distribution.get_version() BuildDoc.run(self) + + class LocalBuildLatex(LocalBuildDoc): + builders = ['latex'] + cmdclass['build_sphinx'] = LocalBuildDoc + cmdclass['build_sphinx_latex'] = LocalBuildLatex except ImportError: pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/version.py new/python-heatclient-0.2.0/heatclient/openstack/common/version.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/openstack/common/version.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/openstack/common/version.py 2013-03-18 00:21:09.000000000 +0100 @@ -24,30 +24,17 @@ import setup -class _deferred_version_string(object): - """Internal helper class which provides delayed version calculation.""" - def __init__(self, version_info, prefix): - self.version_info = version_info - self.prefix = prefix - - def __str__(self): - return "%s%s" % (self.prefix, self.version_info.version_string()) - - def __repr__(self): - return "%s%s" % (self.prefix, self.version_info.version_string()) - - class VersionInfo(object): def __init__(self, package, python_package=None, pre_version=None): """Object that understands versioning for a package - :param package: name of the top level python namespace. For heat, - this would be "heat" for python-heatclient, it - would be "heatclient" + :param package: name of the top level python namespace. For glance, + this would be "glance" for python-glanceclient, it + would be "glanceclient" :param python_package: optional name of the project name. For - heat this can be left unset. For - python-heatclient, this would be - "python-heatclient" + glance this can be left unset. For + python-glanceclient, this would be + "python-glanceclient" :param pre_version: optional version that the project is working to """ self.package = package @@ -57,14 +44,15 @@ self.python_package = python_package self.pre_version = pre_version self.version = None + self._cached_version = None def _generate_version(self): """Defer to the openstack.common.setup routines for making a version from git.""" if self.pre_version is None: - return setup.get_post_version(self.python_package) + return setup.get_post_version(self.package) else: - return setup.get_pre_version(self.python_package, self.pre_version) + return setup.get_pre_version(self.package, self.pre_version) def _newer_version(self, pending_version): """Check to see if we're working with a stale version or not. @@ -138,11 +126,14 @@ else: return '%s-dev' % (version_parts[0],) - def deferred_version_string(self, prefix=""): + def cached_version_string(self, prefix=""): """Generate an object which will expand in a string context to the results of version_string(). We do this so that don't call into pkg_resources every time we start up a program when passing version information into the CONF constructor, but rather only do the calculation when and if a version is requested """ - return _deferred_version_string(self, prefix) + if not self._cached_version: + self._cached_version = "%s%s" % (prefix, + self.version_string()) + return self._cached_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/shell.py new/python-heatclient-0.2.0/heatclient/shell.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/shell.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/shell.py 2013-03-18 00:21:09.000000000 +0100 @@ -129,6 +129,12 @@ parser.add_argument('--os_auth_token', help=argparse.SUPPRESS) + parser.add_argument('--os-no-client-auth', + default=utils.env('OS_NO_CLIENT_AUTH'), + action='store_true', + help="Do not contact keystone for a token.\ + Defaults to env[OS_NO_CLIENT_AUTH]") + parser.add_argument('--heat-url', default=utils.env('HEAT_URL'), help='Defaults to env[HEAT_URL]') @@ -229,10 +235,6 @@ level=logging.DEBUG) httplib2.debuglevel = 1 - else: - logging.basicConfig( - format="%(levelname)s %(message)s", - level=logging.INFO) def main(self, argv): # Parse args once to find version @@ -285,20 +287,25 @@ 'endpoint_type': args.os_endpoint_type, 'insecure': args.insecure } - _ksclient = self._get_ksclient(**kwargs) - token = args.os_auth_token or _ksclient.auth_token - endpoint = args.heat_url or \ - self._get_endpoint(_ksclient, **kwargs) + endpoint = args.heat_url + + if not args.os_no_client_auth: + _ksclient = self._get_ksclient(**kwargs) + token = args.os_auth_token or _ksclient.auth_token + + kwargs = { + 'token': token, + 'insecure': args.insecure, + 'timeout': args.timeout, + 'ca_file': args.ca_file, + 'cert_file': args.cert_file, + 'key_file': args.key_file, + } + + if not endpoint: + endpoint = self._get_endpoint(_ksclient, **kwargs) - kwargs = { - 'token': token, - 'insecure': args.insecure, - 'timeout': args.timeout, - 'ca_file': args.ca_file, - 'cert_file': args.cert_file, - 'key_file': args.key_file, - } if not args.token_only: kwargs['username'] = args.os_username kwargs['password'] = args.os_password diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/v1/shell.py new/python-heatclient-0.2.0/heatclient/v1/shell.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/v1/shell.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/v1/shell.py 2013-03-18 00:21:09.000000000 +0100 @@ -51,6 +51,8 @@ @utils.arg('-c', '--create-timeout', metavar='<TIMEOUT>', default=60, type=int, help='Stack creation timeout in minutes. Default: 60') +(a)utils.arg('-r', '--enable-rollback', default=False, action="store_true", + help='Enable rollback on create/update failure') @utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>', help='Parameter values used to create the stack.') @utils.arg('name', metavar='<STACK_NAME>', @@ -69,6 +71,8 @@ @utils.arg('-c', '--create-timeout', metavar='<TIMEOUT>', default=60, type=int, help='Stack creation timeout in minutes. Default: 60') +(a)utils.arg('-r', '--enable-rollback', default=False, action="store_true", + help='Enable rollback on create/update failure') @utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>', help='Parameter values used to create the stack.') @utils.arg('name', metavar='<STACK_NAME>', @@ -76,7 +80,8 @@ def do_stack_create(hc, args): '''Create the stack''' fields = {'stack_name': args.name, - 'timeoutmins': args.create_timeout, + 'timeout_mins': args.create_timeout, + 'disable_rollback': not(args.enable_rollback), 'parameters': utils.format_parameters(args.parameters)} _set_template_fields(hc, args, fields) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/version.py new/python-heatclient-0.2.0/heatclient/version.py --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/version.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/version.py 2013-03-18 00:21:09.000000000 +0100 @@ -15,5 +15,8 @@ from heatclient.openstack.common import version as common_version +NEXT_VERSION = '0.2.0' + version_info = common_version.VersionInfo('heatclient', + pre_version=NEXT_VERSION, python_package='python-heatclient') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/heatclient/versioninfo new/python-heatclient-0.2.0/heatclient/versioninfo --- old/python-heatclient-0.1.0.2.gb1b5455/heatclient/versioninfo 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/heatclient/versioninfo 2013-03-18 00:22:41.000000000 +0100 @@ -1 +1 @@ -0.1.0.2.gb1b5455 +0.2.0~20130317.3.g3740ae9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/PKG-INFO new/python-heatclient-0.2.0/python_heatclient.egg-info/PKG-INFO --- old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/PKG-INFO 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/python_heatclient.egg-info/PKG-INFO 2013-03-18 00:22:42.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-heatclient -Version: 0.1.0.2.gb1b5455 +Version: 0.2.0 Summary: Client library for Heat orchestration API Home-page: https://github.com/openstack/python-heatclient Author: Heat API Developers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/SOURCES.txt new/python-heatclient-0.2.0/python_heatclient.egg-info/SOURCES.txt --- old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/SOURCES.txt 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/python_heatclient.egg-info/SOURCES.txt 2013-03-18 00:22:43.000000000 +0100 @@ -1,5 +1,3 @@ -.gitignore -.gitreview AUTHORS ChangeLog LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/requires.txt new/python-heatclient-0.2.0/python_heatclient.egg-info/requires.txt --- old/python-heatclient-0.1.0.2.gb1b5455/python_heatclient.egg-info/requires.txt 2013-01-09 01:34:58.000000000 +0100 +++ new/python-heatclient-0.2.0/python_heatclient.egg-info/requires.txt 2013-03-18 00:22:42.000000000 +0100 @@ -1,5 +1,4 @@ httplib2 iso8601>=0.1.4 -prettytable>=0.5,<0.7 -python-keystoneclient>=0.2,<0.3 -warlock<2 \ No newline at end of file +prettytable>=0.6,<0.8 +python-keystoneclient>=0.2,<0.3 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/run_tests.sh new/python-heatclient-0.2.0/run_tests.sh --- old/python-heatclient-0.1.0.2.gb1b5455/run_tests.sh 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/run_tests.sh 2013-03-18 00:21:09.000000000 +0100 @@ -35,13 +35,13 @@ done if [ $just_pep8 -eq 1 ]; then - tox -e pep8 - exit + exec tox -e pep8 fi -tox -e py27 $toxargs 2>&1 | tee run_tests.err.log || exit -if [ ${PIPESTATUS[0]} -ne 0 ]; then - exit ${PIPESTATUS[0]} +tox -e py27 $toxargs 2>&1 | tee run_tests.err.log || exit 1 +tox_exit_code=${PIPESTATUS[0]} +if [ 0$tox_exit_code -ne 0 ]; then + exit $tox_exit_code fi if [ -z "$toxargs" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/setup.py new/python-heatclient-0.2.0/setup.py --- old/python-heatclient-0.1.0.2.gb1b5455/setup.py 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/setup.py 2013-03-18 00:21:09.000000000 +0100 @@ -1,3 +1,5 @@ +#!/usr/bin/python +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,6 +16,7 @@ import setuptools from heatclient.openstack.common import setup +from heatclient.version import version_info as version def read(fname): @@ -21,7 +24,7 @@ setuptools.setup( name="python-heatclient", - version=setup.get_post_version('heatclient'), + version=version.canonical_version_string(always=True), author='Heat API Developers', author_email='discuss(a)heat-api.org', description="Client library for Heat orchestration API", @@ -49,4 +52,5 @@ dependency_links=setup.parse_dependency_links(), tests_require=setup.parse_requirements(['tools/test-requires']), setup_requires=['setuptools-git>=0.4'], + data_files=[('heatclient', ['heatclient/versioninfo'])] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-heatclient-0.1.0.2.gb1b5455/tools/pip-requires new/python-heatclient-0.2.0/tools/pip-requires --- old/python-heatclient-0.1.0.2.gb1b5455/tools/pip-requires 2013-01-09 01:33:45.000000000 +0100 +++ new/python-heatclient-0.2.0/tools/pip-requires 2013-03-18 00:21:12.000000000 +0100 @@ -1,6 +1,5 @@ argparse httplib2 iso8601>=0.1.4 -prettytable>=0.5,<0.7 +prettytable>=0.6,<0.8 python-keystoneclient>=0.2,<0.3 -warlock<2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-glanceclient for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package python-glanceclient for openSUSE:Factory checked in at 2013-04-29 14:17:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-glanceclient (Old) and /work/SRC/openSUSE:Factory/.python-glanceclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-glanceclient", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-glanceclient/python-glanceclient.changes 2013-01-17 09:58:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-glanceclient.new/python-glanceclient.changes 2013-04-29 14:17:02.000000000 +0200 @@ -1,0 +2,95 @@ +Wed Apr 3 11:44:48 UTC 2013 - dmueller(a)suse.com + +- add 31960f0a8584802852d97ec8ce27b5516b32d63b.diff + +------------------------------------------------------------------- +Tue Apr 2 10:12:08 UTC 2013 - dmueller(a)suse.com + +- downgrade to the released tarball (0.8.0) + +------------------------------------------------------------------- +Tue Mar 26 13:43:11 UTC 2013 - dmueller(a)suse.com + +- update to 0.8.0.13 + +------------------------------------------------------------------- +Mon Mar 18 10:42:52 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Wed Mar 13 00:14:12 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.8.0.10+git.1363133652.c7c8e92: + + Implements filters: visibility, owner, member_status. Includes tests. + +-------------------------------------------------------------------- +Tue Mar 12 00:12:02 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.8.0.8+git.1363047122.8787c82: + + Control C does not cancel the CLI cleanly + +-------------------------------------------------------------------- +Mon Mar 11 10:04:27 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.8.0.6+git.1362996267.d810019: + + Add missing spaces in help msg + +-------------------------------------------------------------------- +Tue Mar 5 17:23:47 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.8.0.5+git.1362504227.0ca43be: + + Replace SchemaNotFound with HTTPNotFound + + Use getattr properly in legacy shell + +------------------------------------------------------------------- +Fri Feb 22 14:12:23 UTC 2013 - saschpe(a)suse.de + +- Update to version 0.8.0.2+git.1361542435.6c7fb0e: + + Make effective ssl callback behaviour more obvious + + Update .coveragerc + + Expect minumum warlock version of 0.7.0 + + Add library support for v2 image update + + Update to latest oslo-version. + + Decode input and encode output + + Add docs for v0.8.0 + + Report name resolution errors properly +- Add glanceclient-prettytable.patch: Relax version constraints + on python-prettytable + +------------------------------------------------------------------- +Fri Feb 22 11:26:09 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +-------------------------------------------------------------------- +Mon Feb 11 15:10:58 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.7.0.13+git.1360595458.60cfebc: + + Quote image ids before passing them to glance + +-------------------------------------------------------------------- +Mon Feb 4 12:03:59 UTC 2013 - dmueller(a)suse.com + +- Update to version 0.7.0.12+git.1359979439.ed67c32: + + Fix typo in image-update help page + + Adds image-delete functionality. + + Change https port to be an optional parameter + + Migrate to testr. + +------------------------------------------------------------------- +Thu Jan 17 14:08:20 UTC 2013 - vuntz(a)suse.com + +- Use version-regexp param for git_tarballs service to avoid + uselessly including the last git commit id twice. + +-------------------------------------------------------------------- +Mon Jan 14 12:50:33 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 0.7.0.5.ga5f996c+git.1358164233.a5f996c: + + Add image names to glance command arguments. + + Use testtools instead of unittest. + + Add details to stdout error message. +- Build HTML documentation + +------------------------------------------------------------------- Old: ---- python-glanceclient-master.tar.gz New: ---- 31960f0a8584802852d97ec8ce27b5516b32d63b.diff python-glanceclient-0.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-glanceclient.spec ++++++ --- /var/tmp/diff_new_pack.kPYv28/_old 2013-04-29 14:17:03.000000000 +0200 +++ /var/tmp/diff_new_pack.kPYv28/_new 2013-04-29 14:17:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-glanceclient # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,23 +19,32 @@ %define component glanceclient Name: python-glanceclient -Version: 0.6.0.14.gc057fe4+git.1355912586.c057fe4 +Version: 0.8.0 Release: 0 -License: Apache-2.0 Summary: Openstack Image (Glance) API Client -Url: http://launchpad.net/python-glanceclient +License: Apache-2.0 Group: Development/Languages/Python -Source: python-glanceclient-master.tar.gz +Url: http://launchpad.net/python-glanceclient +Source: python-glanceclient-0.8.0.tar.gz Source2: openstack-glance.sh -BuildRequires: openstack-macros +Patch0: 31960f0a8584802852d97ec8ce27b5516b32d63b.diff +BuildRequires: openstack-suse-macros BuildRequires: python-base BuildRequires: python-distribute +# Documentation build requirements: +BuildRequires: python-Sphinx +BuildRequires: python-iso8601 +BuildRequires: python-keystoneclient +BuildRequires: python-prettytable +BuildRequires: python-pyOpenSSL +BuildRequires: python-warlock Requires: python >= 2.6.8 +Requires: python-argparse # /usr/bin/glance uses pkg_resources, thus: Requires: python-distribute -Requires: python-httplib2 -Requires: python-prettytable Requires: python-keystoneclient +Requires: python-prettytable >= 0.6 +Requires: python-pyOpenSSL Requires: python-warlock BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -52,30 +61,29 @@ Summary: Openstack Image (Glance) API Client - Testsuite Group: System/Management Requires: %{name} = %{version} -Requires: python-mock Requires: python-mox Requires: python-nose Requires: python-nose-exclude Requires: python-nosehtmloutput Requires: python-nosexcover Requires: python-openstack.nose_plugin +Requires: python-pep8 +Requires: python-testtools >= 0.9.22 Requires: python-tox -Requires: python-unittest2 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n python-glanceclient-0.6.0.14.gc057fe4 +%setup -q -n python-glanceclient-0.8.0 +%patch0 -p1 %openstack_cleanup_prep # Our package versioning scheme is different (but we provide the correct thing) thus: sed -i "s|python-keystoneclient>=0.1.2,<1|python-keystoneclient|" tools/pip-requires %build python setup.py build -# Just a small index.rst so far, so no need to build the doc -#python setup.py build_sphinx -#python setup.py build_sphinx -b man +python setup.py build_sphinx %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-data=%{python_sitelib} @@ -88,8 +96,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README.rst -%doc doc/source/index.rst +%doc LICENSE README.rst doc/build/html %{_sysconfdir}/bash_completion.d/openstack-glance.sh %{_bindir}/glance %{python_sitelib}/%{component}/ ++++++ 31960f0a8584802852d97ec8ce27b5516b32d63b.diff ++++++ commit 31960f0a8584802852d97ec8ce27b5516b32d63b Author: Dirk Mueller <dirk(a)dmllr.de> Date: Fri Feb 22 16:11:12 2013 +0100 Allow for prettytable 0.7.x as well Relax requirements to >= 0.6, < 0.8, as 0.7.x seems to work as well. Added testcase to ensure this. Change-Id: I1a1a709e6053451b1256a0d78f8fe8562fb10e62 diff --git a/tests/test_utils.py b/tests/test_utils.py index 3f275b8..279f5d6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -15,6 +15,8 @@ import errno import testtools +import sys +import StringIO from glanceclient.common import utils @@ -69,6 +71,47 @@ class TestUtils(testtools.TestCase): self.assertEqual(u'ni\xf1o', ensure_unicode('ni\xc3\xb1o', incoming='ascii')) + def test_prettytable(self): + class Struct: + def __init__(self, **entries): + self.__dict__.update(entries) + + # test that the prettytable output is wellformatted (left-aligned) + columns = ['ID', 'Name'] + val = ['Name1', 'another', 'veeeery long'] + images = [Struct(**{'id': i ** 16, 'name': val[i]}) + for i in range(len(val))] + + saved_stdout = sys.stdout + try: + sys.stdout = output_list = StringIO.StringIO() + utils.print_list(images, columns) + + sys.stdout = output_dict = StringIO.StringIO() + utils.print_dict({'K': 'k', 'Key': 'Value'}) + + finally: + sys.stdout = saved_stdout + + self.assertEqual(output_list.getvalue(), '''\ ++-------+--------------+ +| ID | Name | ++-------+--------------+ +| | Name1 | +| 1 | another | +| 65536 | veeeery long | ++-------+--------------+ +''') + + self.assertEqual(output_dict.getvalue(), '''\ ++----------+-------+ +| Property | Value | ++----------+-------+ +| K | k | +| Key | Value | ++----------+-------+ +''') + def test_ensure_str(self): ensure_str = utils.ensure_str self.assertEqual("True", ensure_str(True)) diff --git a/tools/pip-requires b/tools/pip-requires index e5a9941..7aaf5da 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,5 +1,5 @@ argparse -prettytable>=0.6,<0.7 +prettytable>=0.6,<0.8 python-keystoneclient>=0.1.2,<1 pyOpenSSL warlock>=0.7.0,<2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kPYv28/_old 2013-04-29 14:17:03.000000000 +0200 +++ /var/tmp/diff_new_pack.kPYv28/_new 2013-04-29 14:17:03.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-maste…</param> + <param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-0.8.0…</param> <param name="email">cloud-devel(a)suse.de</param> + <param name="plain-version">True</param> </service> </services> ++++++ python-glanceclient-master.tar.gz -> python-glanceclient-0.8.0.tar.gz ++++++ ++++ 2101 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-cinderclient for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package python-cinderclient for openSUSE:Factory checked in at 2013-04-29 14:16:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cinderclient (Old) and /work/SRC/openSUSE:Factory/.python-cinderclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cinderclient", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cinderclient/python-cinderclient.changes 2013-04-05 13:10:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cinderclient.new/python-cinderclient.changes 2013-04-29 14:16:43.000000000 +0200 @@ -2 +2 @@ -Wed Mar 27 14:41:40 UTC 2013 - bwiedemann(a)suse.com +Tue Apr 2 09:46:11 UTC 2013 - dmueller(a)suse.com @@ -4 +4,2 @@ -- Add missing python-requests Requires. +- update to 1.0.3: + + Released version of the tarball @@ -7 +8 @@ -Wed Mar 6 15:06:33 UTC 2013 - vuntz(a)suse.com +Mon Mar 18 10:42:23 UTC 2013 - speilicke(a)suse.com @@ -9,2 +10,73 @@ -- Add compat-newer-requests.patch: take patches from upstream to - allow working with newer versions of python-requests. +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Fri Feb 22 12:57:59 UTC 2013 - saschpe(a)suse.de + +- Update to version 1.0.2.26+git.1361537879.458ff24: + + Allow requests 0.8 and greater + + Avoid UnicodeEncodeError exception on exception + + Handle metadata args the same for all calls. + + Fix upload-to-image volume_id help + + adding v2 support to cinderclient + + Fix typo breaking --debug option to cinder client +- Drop patches (merged upstream): + + print-exceptions.patch + + support-requests-1.0.patch + +------------------------------------------------------------------- +Fri Feb 22 11:27:25 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- +Tue Feb 12 17:20:28 UTC 2013 - dmueller(a)suse.com + +- Update support-requests-1.0.patch: + + Use alternative version from upstream + +------------------------------------------------------------------- +Mon Feb 11 16:14:36 UTC 2013 - dmueller(a)suse.com + +- Fix requires of test package + +-------------------------------------------------------------------- +Mon Feb 11 15:10:30 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.0.2.17+git.1360595430.c5cd7e4: + + Correct parsing of volume metadata + + Update to latest oslo version code. + + Re-add setuptools-git to setup.py. + +------------------------------------------------------------------- +Wed Feb 6 16:35:02 UTC 2013 - dmueller(a)suse.com + +- Add print-exceptions.patch: + Fix printing of exceptions +- Add support-requests-1.0.patch + Fix support for requests >= 1.0 + +-------------------------------------------------------------------- +Mon Feb 4 12:03:11 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.0.2.13+git.1359979391.b49f727: + + Fixed documentation of the cinder shell command. + + Change Nova -> Cinder in credentials error message + + Add ability to call force_delete from cinderclient + + Move from nose to testr. + + Fixed Version Functionality + + Add upload-to-image function to client. + +------------------------------------------------------------------- +Thu Jan 17 14:08:20 UTC 2013 - vuntz(a)suse.com + +- Use version-regexp param for git_tarballs service to avoid + uselessly including the last git commit id twice. + +-------------------------------------------------------------------- +Mon Jan 14 12:42:54 UTC 2013 - saschpe(a)suse.de + +- Update to version 1.0.2.3.g61e2a42+git.1358163774.61e2a42: + + Add access to update volume metadata. + + Move from unittest2 to testtools + + Add list-extensions capability to cinderclient. +- Updated requirements Old: ---- compat-newer-requests.patch python-cinderclient-master.tar.gz New: ---- python-cinderclient-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cinderclient.spec ++++++ --- /var/tmp/diff_new_pack.Oj8pdJ/_old 2013-04-29 14:16:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Oj8pdJ/_new 2013-04-29 14:16:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-cinderclient # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,29 +19,27 @@ %define component cinderclient Name: python-%{component} -Version: 1.0.1.5.g82e47d0+git.1355912775.82e47d0 +Version: 1.0.3 Release: 0 -License: Apache-2.0 Summary: Openstack Block Storage (Cinder) API Client -Url: http://launchpad.net/python-cinderclient +License: Apache-2.0 Group: Development/Languages/Python -Source: python-cinderclient-master.tar.gz -# PATCH-FIX-UPSTREAM compat-newer-requests.patch vuntz(a)suse.com -- Add patches from git to work with more recent versions of python-requests -Patch0: compat-newer-requests.patch -BuildRequires: openstack-macros +Url: http://launchpad.net/python-cinderclient +Source: python-cinderclient-1.0.3.tar.gz +BuildRequires: openstack-suse-macros BuildRequires: python-base BuildRequires: python-distribute -# Packages below are only needed for documentation build -BuildRequires: python-httplib2 -BuildRequires: python-prettytable +# Documentation build requirements: BuildRequires: python-Sphinx +BuildRequires: python-prettytable +BuildRequires: python-requests Requires: python >= 2.6.8 Requires: python-argparse +# /usr/bin/cinder uses pkg_resources, thus: Requires: python-distribute -#Requires: python-httplib2 Requires: python-prettytable -Requires: python-simplejson Requires: python-requests +Requires: python-simplejson BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -66,18 +64,22 @@ Summary: Openstack Block Storage (Cinder) API Client - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} +Requires: python-fixtures Requires: python-mock Requires: python-nose -Requires: python-unittest2 +Requires: python-nosehtmloutput +Requires: python-nosexcover +Requires: python-openstack.nose_plugin +Requires: python-pep8 +Requires: python-testrepository >= 0.0.13 %description test This package contains testsuite files for %{name}. %prep -%setup -q -n python-cinderclient-1.0.1.5.g82e47d0 +%setup -q -n python-cinderclient-1.0.3 %openstack_cleanup_prep echo %{version} > cinderclient/versioninfo -%patch0 -p1 %build python setup.py build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Oj8pdJ/_old 2013-04-29 14:16:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Oj8pdJ/_new 2013-04-29 14:16:45.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/python-cinderclient/python-cinderclient-maste…</param> + <param name="url">http://tarballs.openstack.org/python-cinderclient/python-cinderclient-1.0.3…</param> <param name="email">cloud-devel(a)suse.de</param> + <param name="plain-version">True</param> </service> </services> ++++++ python-cinderclient-master.tar.gz -> python-cinderclient-1.0.3.tar.gz ++++++ ++++ 6768 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvswitch for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2013-04-29 14:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openvswitch (Old) and /work/SRC/openSUSE:Factory/.openvswitch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openvswitch", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes 2013-04-29 14:15:27.000000000 +0200 @@ -0,0 +1,220 @@ +------------------------------------------------------------------- +Wed Apr 3 09:30:20 UTC 2013 - tpaszkowski(a)novell.com + +- %make_install macro no longer works on SLE11. Spec file now uses %makeinstall. + + +------------------------------------------------------------------- +Tue Mar 26 11:21:37 UTC 2013 - speilicke(a)suse.com + +- Use build conditionals instead of %define and disable GUI by default + everywhere + +------------------------------------------------------------------- +Thu Mar 21 13:23:36 UTC 2013 - tpaszkowski(a)novell.com + +- Fix openvswitch-controller init script +- Add openflow-controller sysconfig file with default binding to ptcp: + +------------------------------------------------------------------- +Tue Mar 12 13:36:57 UTC 2013 - tpaszkowski(a)suse.com + +- ipsec build temporary disabled + +------------------------------------------------------------------- +Fri Mar 8 14:16:57 UTC 2013 - tpaszkowski(a)suse.com + +- Provides and Obsolete for former openvswitch-common package + +------------------------------------------------------------------- +Thu Mar 7 21:49:09 UTC 2013 - tpaszkowski(a)suse.com + +- always build in openvswitch kernel module (gre tunelling not present + within the standard kernel module) +- removed unnedded build rquirements (move to appropriate subpackage) +- moved common stuff to main pkg +- added group filed to packages and sub packages +- switch pkg suggest kernel module pkg +- moved python test stuff to python-openvswitch-test sub pkg +- moved ui interface requirements to ovsdbmonitor sub pkg +- ovsdbmonitor will not be build on sles (for now) +- sub pkg test require python-twisted (ovs-test) +- don't call boot.sh on sles11 (old autoconf). Shipped configuration stuff + is ok (we don't patch plenty of stuff) +- ovs-parse-backtrace now part of main pkg +- addes ovs-l3ping,ovs-vlan-test to test sub pkg + + +------------------------------------------------------------------- +Thu Feb 28 22:17:11 UTC 2013 - e.istomin(a)edss.ee + +- New upstream version 1.9.0 + http://openvswitch.org/releases/NEWS-1.9.0 + +------------------------------------------------------------------- +Thu Nov 15 08:59:41 UTC 2012 - rhafer(a)suse.com + +- New patch openvswitch-1.7.1-ovs-pki-permissions.patch: Avoid + creating world writeable directory (bnc#774332, CVE-2012-3449) + +------------------------------------------------------------------- +Sun Sep 9 15:33:08 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.7.1 + * This release only contain bug fixes. + +------------------------------------------------------------------- +Tue Jul 31 12:41:19 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.7.0 + * kernel modules are renamed. openvswitch_mod.ko is now + openvswitch.ko and brcompat_mod.ko is now brcompat.ko. + * Increased the number of NXM registers to 8. + * Added ability to configure DSCP setting for manager and controller + connections. By default, these connections have a DSCP value of + Internetwork Control (0xc0). + * Added the granular link health statistics, 'cfm_health', to an + interface. + * OpenFlow: + - Added support to mask nd_target for ICMPv6 neighbor discovery flows. + - Added support for OpenFlow 1.3 port description (OFPMP_PORT_DESC) + multipart messages. + * ovs-ofctl: + - Added the "dump-ports-desc" command to retrieve port + information using the new port description multipart messages. + * ovs-test: + - Added support for spawning ovs-test server from the client. + - Now ovs-test is able to automatically create test bridges and ports. + * "ovs-dpctl dump-flows" now prints observed TCP flags in TCP flows. + * Tripled flow setup performance. + * The "coverage/log" command previously available through ovs-appctl + has been replaced by "coverage/show". The new command replies with + coverage counter values, instead of logging them. +- Adjusted openvswitch-1.1.0-stp-fwd-delay.patch (new filename) + +------------------------------------------------------------------- +Thu Jul 26 11:47:36 UTC 2012 - rhafer(a)suse.com + +- The kernel modules where renamed in recent kernels. Backported a + patch from the 1.7 branch to use the new kernel names when + building on openSUSE > 12.1. + +------------------------------------------------------------------- +Tue Jun 26 15:09:02 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.6.1 + * Added support for bitwise matching on TCP and UDP ports. + * Support for limiting the number of flows in an OpenFlow flow + table, with configurable policy for evicting flows upon + overflow. + * Added an OpenFlow extension that allows controllers more precise + control over which messages they receive asynchronously. + * CFM module CCM broadcasts can now be tagged with an 802.1p priority. + * Load balancing for bonds can be disabled. + +------------------------------------------------------------------- +Wed Jun 6 15:04:45 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.5.0 + * OpenFlow: + - Added support for querying, modifying, and deleting flows + based on flow cookie when using NXM. + - Added new NXM_PACKET_IN format. + * ovs-ofctl: + - Added daemonization support to the monitor and snoop commands. + * ovs-vsctl: + - The "find" command supports new set relational operators + {=}, {!=}, {<}, {>}, {<=}, and {>=}. + * ovsdb-tool now uses the typical database and schema installation + directories as defaults. + +------------------------------------------------------------------- +Thu May 10 22:32:34 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.4.1 + * The default MAC learning timeout has been increased from 60 seconds + to 300 seconds. The MAC learning timeout is now configurable. + * Bug fixes + +------------------------------------------------------------------- +Thu Apr 5 10:08:32 UTC 2012 - on(a)morlock.nu + +- Build KMP packages from kernel-source on openSuSE > 12.1. + +------------------------------------------------------------------- +Tue Mar 13 12:16:43 UTC 2012 - mvidner(a)suse.com + +- Specify defattr for pki subpackage to fix 11.4 build. + +------------------------------------------------------------------- +Thu Mar 1 13:35:52 UTC 2012 - dmacvicar(a)suse.de + +- Rewrite the package based on the debian version instead + * current package was tied to xenserver config without + even requiring it + * instead of one big package depending even on qt4, there + are -switch, -controller, -test subpackages now + +------------------------------------------------------------------- +Mon Feb 20 23:39:50 UTC 2012 - on(a)morlock.nu + +- New upstream version 1.4.0 + * Compatible with Open vSwitch kernel module included in Linux 3.3. + * Don't require the "normal" action to use mirrors. + * New "VLAN splinters" feature to work around buggy device driver in old Linux versions. + * Added ability to match ECN and TTL in IPv4 and IPv6 headers. + * Added ability to match IPv6 flow label. + * Added ability to modify ECN bits and TTL in IPv4 headers. + * And many others. See the full change log here: + http://openvswitch.org/releases/NEWS-1.4.0 + +------------------------------------------------------------------- +Fri Sep 2 09:11:21 UTC 2011 - andrea(a)opensuse.org + +- new uopstream version 1.2.1 + * The release only contains bug fixes for the 1.2.0 release + +------------------------------------------------------------------- +Mon Aug 8 17:47:58 UTC 2011 - andrea(a)opensuse.org + +- new upstream version 1.2.0 + * New abstraction layer to make better use of switching ASICs + * Packaging for Red Hat (RHEL) 5.6 and 6.0 + * Datapath support for Linux kernels up to 3.0 + * And many others. See the full change log here: + http://openvswitch.org/releases/ChangeLog-1.2.0 +- rebased openvswitch-1.1.0-suse.patch as + openvswitch-1.2.0-suse.patch to apply to the files +------------------------------------------------------------------- +Thu Jun 23 06:49:16 UTC 2011 - andrea(a)opensuse.org + +- new upstream version 1.1.1 + * bug fix release + +------------------------------------------------------------------- +Wed May 18 10:09:45 UTC 2011 - andrea(a)opensuse.org + +- re-enabled kmp package since openvswitch_mod.ko and ++++ 23 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes New: ---- Module.supported README.packager openvswitch-1.7.0-stp-fwd-delay.patch openvswitch-1.9.0.tar.gz openvswitch-controller.init openvswitch-controller.sysconfig openvswitch-ipsec.init openvswitch-switch.init openvswitch-switch.logrotate openvswitch-switch.template openvswitch.changes openvswitch.spec preamble ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvswitch.spec ++++++ # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # Enable KMP building by default: %bcond_without kmp # Don't build in-kernel module, the shipped one is more feature rich: %bcond_with kernel_kmp # IpSec build disabled temporarily (need to upgrade ipsec-tools): %bcond_with ipsec # Disable GUI building by default (heavy Qt4 dependencies): %bcond_with gui Name: openvswitch Version: 1.9.0 Release: 0 License: Apache-2.0 Summary: An open source, production quality, multilayer virtual switch Url: http://openswitch.org/ Group: Productivity/Networking/System Source0: http://openvswitch.org/releases/%{name}-%{version}.tar.gz Source1: preamble Source2: openvswitch-switch.init Source3: openvswitch-switch.template Source4: openvswitch-switch.logrotate Source5: openvswitch-controller.init Source6: openvswitch-controller.sysconfig # brcompat is going to be deprecated soon # PATCH-FEATURE-UPSTREAM openvswitch-1.7.0-stp-fwd-delay.patch -- Set STP bridge forward delay Patch1: %{name}-1.7.0-stp-fwd-delay.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: graphviz BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: make BuildRequires: openssl BuildRequires: perl BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: valgrind-devel BuildRequires: fdupes Requires: logrotate Requires: openssl Requires: python Provides: openvswitch-common = %{version} Obsoletes: openvswitch-common < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %description Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, RSPAN, ERSPAN, CLI, LACP, 802.1ag). In addition, it is designed to support distribution across multiple physical servers similar to VMware’s vNetwork distributed vswitch or Cisco’s Nexus 1000V. %if %{with kmp} %package kmp Summary: Open vSwitch kernel modules Group: System/Kernel BuildRequires: %kernel_module_package_buildreqs %if %{with kernel_kmp} BuildRequires: kernel-source %endif %suse_kernel_module_package -p %_sourcedir/preamble ec2 xen xenpae vmi um %description -n %{name}-kmp Kernel modules supporting the openvswitch datapath %endif %if %{with ipsec} %package ipsec Summary: Open vSwitch GRE-over-IPsec support Group: Productivity/Networking/System Requires: %{name} = %{version} Requires: %{name}-switch = %{version} Requires: ipsec-tools >= 0.8 Requires: python Requires: python-argparse Requires: python-openvswitch = %{version} Requires: racoon >= 0.8 %description ipsec The ovs-monitor-ipsec script provides support for encrypting GRE tunnels with IPsec. Open vSwitch is a full-featured software-based Ethernet switch. %endif %package switch Summary: Open vSwitch switch implementations Group: Productivity/Networking/System Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq Requires: module-init-tools Requires: openvswitch = %{version} Requires: procps Requires: python Requires: uuid-runtime Suggests: openvswitch-kmp Suggests: logrotate %description switch openvswitch-switch provides the userspace components and utilities for the Open vSwitch kernel-based switch. Open vSwitch is a full-featured software-based Ethernet switch. %package pki Summary: Open vSwitch public key infrastructure dependency package Group: Productivity/Networking/System Requires: openvswitch = %{version} %description pki openvswitch-pki provides PKI (public key infrastructure) support for Open vSwitch switches and controllers, reducing the risk of man-in-the-middle attacks on the Open vSwitch network infrastructure. Open vSwitch is a full-featured software-based Ethernet switch. %package controller Summary: Open vSwitch controller implementation Group: Productivity/Networking/System Requires: openvswitch = %{version} %description controller The Open vSwitch controller enables OpenFlow switches that connect to it to act as MAC-learning Ethernet switches. Open vSwitch is a full-featured software-based Ethernet switch. %package brcompat Summary: Open vSwitch bridge compatibility support (deprecated) Group: Productivity/Networking/System Requires: openvswitch-switch = %{version} Recommends: bridge-utils %description brcompat openvswitch-brcompat provides a way for applications that use the Linux bridge to gradually migrate to Open vSwitch. Programs that ordinarily control the Linux bridge module, such as "brctl", instead control the Open vSwitch kernel-based switch. Please note that this feature is deprecated and will ve removed soon. Once this package is installed, adding BRCOMPAT=yes in /etc/default/openvswitch-switch enables bridge compatibility. Open vSwitch is a full-featured software-based Ethernet switch. %package -n python-openvswitch Summary: Python bindings for Open vSwitch Group: Productivity/Networking/System Requires: python %description -n python-openvswitch This package contains the full Python bindings for Open vSwitch database. %package -n python-openvswitch-test Summary: Python bindings for Open vSwitch Group: Productivity/Networking/System Requires: python %description -n python-openvswitch-test This package contains the full Python bindings for Open vSwitch database. %if %{with gui} %package ovsdbmonitor Summary: Open vSwitch graphical monitoring tool Group: Productivity/Networking/System BuildRequires: python-pyside BuildRequires: python-qt4-devel BuildRequires: python-twisted BuildRequires: python-zopeinterface Requires: python-openvswitch Requires: python-pyasn1 Requires: python-pyside Requires: python-qt4 Requires: python-twisted Requires: python-zopeinterface %description ovsdbmonitor This package is a GUI tool for monitoring and troubleshooting local or remote Open vSwitch installations. It presents GUI tables that graphically represent an Open vSwitch kernel flow table (similar to "ovs-dpctl dump-flows") and Open vSwitch database contents (similar to "ovs-vsctl list <table>"). Open vSwitch is a full-featured software-based Ethernet switch. %endif %package test Summary: Open vSwitch test package Group: Productivity/Networking/System Requires: python Requires: python-argparse Requires: python-openvswitch-test = %{version} Requires: python-twisted %description test This package contains utilities that are useful to diagnose performance and connectivity issues in Open vSwitch setup. Open vSwitch is a full-featured software-based Ethernet switch. %prep %setup -q %patch1 -p1 set -- * mkdir source mv "$@" source/ mkdir obj %build pushd source # don't call boot.sh, we don't have appropriate autoconf there %if ! 0%{?sles_version} bash -x boot.sh %endif popd %if %{with kmp} %if %{with kernel_kmp} for flavor in %flavors_to_build; do mkdir -p $flavor cp -a $RPM_SOURCE_DIR/Module.supported $flavor/ krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) kernel_source_dir=$(readlink /lib/modules/$krel/source) cp -a $kernel_source_dir/net/openvswitch/* $flavor/ make -C %{kernel_source $flavor} modules M=$PWD/$flavor done %else export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' for flavor in %flavors_to_build; do rm -rf obj/$flavor cp -r source obj/$flavor pushd obj/$flavor %configure \ --with-logdir=/var/log \ --with-linux=/usr/src/linux-obj/%_target_cpu/$flavor \ --with-linux-source=/usr/src/linux cd datapath/linux make popd done %endif %endif ls source pushd source %configure \ --with-logdir=/var/log make %{?_smp_mflags} popd %install %if %{with kmp} export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do %if %{with kernel_kmp} make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor %else pushd obj/$flavor/datapath/linux make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD popd %endif done %endif pushd source %makeinstall install -d -m 755 %{buildroot}/%{_sysconfdir}/init.d install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 %{SOURCE3} \ %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}-switch install -m 644 %{SOURCE6} \ %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}-controller install -m 755 %{SOURCE2} \ %{buildroot}/%{_sysconfdir}/init.d/%{name}-switch ln -s %{_sysconfdir}/init.d/%{name}-switch %{buildroot}%{_sbindir}/rc%{name}-switch install -m 755 %{SOURCE5} \ %{buildroot}/%{_sysconfdir}/init.d/%{name}-controller ln -s %{_sysconfdir}/init.d/%{name}-controller %{buildroot}%{_sbindir}/rc%{name}-controller install -d -m 755 %{buildroot}/%{_sysconfdir}/sysconfig install -d -m 755 %{buildroot}/%{_sysconfdir}/logrotate.d install -d -m 755 %{buildroot}/var/log/openvswitch install -m 644 %{SOURCE4} \ %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-switch install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d install -d -m 755 %{buildroot}/%{_datadir}/%{name}/scripts install -m 644 vswitchd/vswitch.ovsschema \ %{buildroot}/%{_datadir}/%{name}/vswitch.ovsschema %if %{with ipsec} install -m 755 debian/ovs-monitor-ipsec \ %{buildroot}/%{_datadir}/%{name}/ovs-monitor-ipsec %endif popd mkdir -p %{buildroot}%{py_sitedir} mv %{buildroot}%{_datadir}/%{name}/python/* %{buildroot}%{py_sitedir} rmdir %{buildroot}%{_datadir}/%{name}/python %fdupes %{buildroot}%{py_sitedir} %post switch %{fillup_and_insserv openvswitch-switch} %preun switch %stop_on_removal openvswitch-switch %postun switch %restart_on_update openvswitch-switch %insserv_cleanup %preun controller %stop_on_removal openvswitch-controller %postun controller %restart_on_update openvswitch-controller %insserv_cleanup %files brcompat %defattr(-,root,root) %{_sbindir}/ovs-brcompatd %{_mandir}/man8/ovs-brcompatd.8.gz %files %defattr(-,root,root) %dir %{_datadir}/openvswitch %doc source/AUTHORS source/DESIGN source/INSTALL.* source/NOTICE %doc source/REPORTING-BUGS source/PORTING %doc source/SubmittingPatches source/CodingStyle source/README %doc source/WHY-OVS source/COPYING source/README-gcov %{_bindir}/ovs-appctl %{_bindir}/ovs-benchmark %{_bindir}/ovs-ofctl %{_bindir}/ovs-parse-leaks %{_bindir}/ovsdb-client %{_bindir}/ovs-parse-backtrace %{_sbindir}/ovs-bugtool %{_sbindir}/ovs-vlan-bug-workaround %dir %{_datadir}/openvswitch/scripts %{_datadir}/openvswitch/bugtool-plugins %{_datadir}/openvswitch/scripts/ovs-bugtool-cfm-show %{_datadir}/openvswitch/scripts/ovs-bugtool-lacp-show %{_datadir}/openvswitch/scripts/ovs-bugtool-tc-class-show %{_datadir}/openvswitch/scripts/ovs-bugtool-ovsdb-dump %{_datadir}/openvswitch/scripts/ovs-bugtool-bond-show %{_datadir}/openvswitch/scripts/ovs-bugtool-coverage-show %{_datadir}/openvswitch/scripts/ovs-bugtool-daemons-ver %{_datadir}/openvswitch/scripts/ovs-bugtool-vsctl-show %{_datadir}/openvswitch/scripts/ovs-bugtool-memory-show %{_mandir}/man1/ovs-benchmark.1.gz %{_mandir}/man1/ovsdb-client.1.gz %{_mandir}/man8/ovs-appctl.8.gz %{_mandir}/man8/ovs-bugtool.8.gz %{_mandir}/man8/ovs-ofctl.8.gz %{_mandir}/man8/ovs-parse-leaks.8.gz %{_mandir}/man8/ovs-vlan-bug-workaround.8.gz %{_mandir}/man8/ovs-parse-backtrace.8.gz %files pki %defattr(-,root,root) %{_mandir}/man8/ovs-pki.8.gz %{_bindir}/ovs-pki %files controller %defattr(-,root,root) %{_bindir}/ovs-controller %{_sysconfdir}/init.d/openvswitch-controller %{_sbindir}/rc%{name}-controller %{_mandir}/man8/ovs-controller.8.gz %{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch-controller %files -n python-openvswitch %defattr(-,root,root) %{py_sitedir}/ovs/ %files -n python-openvswitch-test %defattr(-,root,root) %{py_sitedir}/ovstest/ %if %{with ipsec} %files ipsec %defattr(-,root,root) %{_datadir}/openvswitch/ovs-monitor-ipsec %endif %files switch %defattr(-,root,root) %{_bindir}/ovs-dpctl %{_bindir}/ovs-tcpundump %{_bindir}/ovs-pcap %{_bindir}/ovs-vsctl %{_bindir}/ovsdb-tool %{_sbindir}/ovs-vswitchd %{_sbindir}/ovsdb-server %{_datadir}/openvswitch/scripts/ovs-check-dead-ifs %{_datadir}/openvswitch/scripts/ovs-ctl %{_datadir}/openvswitch/scripts/ovs-lib %{_datadir}/openvswitch/scripts/ovs-save %{_datadir}/openvswitch/vswitch.ovsschema %{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch-switch %{_sysconfdir}/init.d/openvswitch-switch %{_sbindir}/rc%{name}-switch %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch %{_mandir}/man8/ovs-dpctl.8.gz %{_mandir}/man1/ovs-tcpundump.1.gz %{_mandir}/man1/ovs-pcap.1.gz %{_mandir}/man8/ovs-vsctl.8.gz %{_mandir}/man1/ovsdb-tool.1.gz %{_mandir}/man8/ovs-vswitchd.8.gz %{_mandir}/man1/ovsdb-server.1.gz %{_mandir}/man5/ovs-vswitchd.conf.db.5.gz %{_mandir}/man8/ovs-ctl.8.gz %dir /var/log/openvswitch %files test %defattr(-,root,root) %{_bindir}/ovs-test %{_bindir}/ovs-l3ping %{_bindir}/ovs-vlan-test %{_mandir}/man8/ovs-test.8.gz %{_mandir}/man8/ovs-l3ping.8.gz %{_mandir}/man8/ovs-vlan-test.8.gz %if %{with gui} %files ovsdbmonitor %defattr(-,root,root) %{_bindir}/ovsdbmonitor %dir %{_datadir}/ovsdbmonitor %{_datadir}/applications/ovsdbmonitor.desktop %{_datadir}/ovsdbmonitor/* %{_mandir}/man1/ovsdbmonitor.1.gz %endif %changelog ++++++ Module.supported ++++++ - kernel/net/openvswitch/openvswitch ++++++ README.packager ++++++ This package is based on the Debian openvswitch package as the original openvswitch package in the build service was next to useless due of being based on the xenserver/ directory of the sources, which tied the package completely to xen. Also, the original package was one big package depending even on Qt4. This package splits in varius subpackages. The xen part was removed. If it needs to be added again, it needs to be its subpackage. TODO: - [DONE] sysconfig is bogus, as the init scripts do not source it yet (uses debian defaults file) - pki component does not have the postun postin scripts yet ++++++ openvswitch-1.7.0-stp-fwd-delay.patch ++++++ diff -ruN openvswitch-1.7.0/datapath/brcompat_main.c openvswitch-1.7.0.new/datapath/brcompat_main.c --- openvswitch-1.7.0/datapath/brcompat_main.c 2012-07-19 00:24:18.000000000 +0200 +++ openvswitch-1.7.0.new/datapath/brcompat_main.c 2012-07-31 13:51:47.319114805 +0200 @@ -327,6 +327,19 @@ return -ENOMEM; } +static int brc_set_bridge_forward_delay(struct net_device *dev, + unsigned long delay) +{ + printk("attempting to set bridge forward delay %u\n", delay); + return 0; +} + +static int brc_stp_set_enabled(struct net_device *dev, unsigned long state) +{ + printk("attempting to set bridge STP to %u\n", state); + return 0; +} + /* Legacy ioctl's through SIOCDEVPRIVATE. Called with rtnl_lock. */ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { @@ -350,6 +363,11 @@ case BRCTL_GET_FDB_ENTRIES: return brc_get_fdb_entries(dev, (void __user *)args[1], args[2], args[3]); + case BRCTL_SET_BRIDGE_FORWARD_DELAY: + return brc_set_bridge_forward_delay(dev, args[1]); + + case BRCTL_SET_BRIDGE_STP_STATE: + return brc_stp_set_enabled(dev, args[1]); } return -EOPNOTSUPP; ++++++ openvswitch-controller.init ++++++ #!/bin/sh # # Copyright (c) 2011 Nicira Networks Inc. # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs(a)debian.org> # # This is free software; you may redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2, # or (at your option) any later version. # # This is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License with # the Debian operating system, in /usr/share/common-licenses/GPL; if # not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA # ### BEGIN INIT INFO # Provides: openvswitch-controller # Required-Start: $network $local_fs $remote_fs # Required-Stop: $remote_fs # Should-Start: $named # Should-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Open vSwitch controller ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/ovs-controller # Introduce the server's location here NAME=ovs-controller # Introduce the short server's name here DESC=ovs-controller # Introduce a short description here LOGDIR=/var/log/openvswitch # Log directory to use PIDFILE=/var/run/openvswitch/$NAME.pid test -x $DAEMON || exit 0 . /lib/lsb/init-functions # Default options, these can be overriden by the information # at /etc/default/openvswitch-controller DAEMON_OPTS="" # Additional options given to the server DODTIME=10 # Time to wait for the server to die, in seconds # If this value is set too low you might not # let some servers to die gracefully and # 'restart' will not work LOGFILE=$LOGDIR/$NAME.log # Server logfile #DAEMONUSER= # User to run the daemons as. If this value # is set start-stop-daemon will chuid the server # Include defaults if available default=/etc/sysconfig/openvswitch-controller if [ -f $default ] ; then . $default fi # Check that the user exists (if we set a user) # Does the user exist? if [ -n "$DAEMONUSER" ] ; then if getent passwd | grep -q "^$DAEMONUSER:"; then # Obtain the uid and gid DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'` DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'` else echo "The user $DAEMONUSER, required to run $NAME does not exist." exit 1 fi fi set -e running_pid() { # Check if a given process pid's cmdline matches a given name pid=$1 name=$2 [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # Is this the expected server [ "$cmd" != "$name" ] && return 1 return 0 } running() { # Check if the process is running looking at /proc # (works for all users) # No pidfile, probably no daemon present [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` running_pid $pid $DAEMON || return 1 return 0 } start_server() { if [ -z "$LISTEN" ]; then echo "$default: No connection methods configured, controller disabled" >&2 exit 0 fi if [ ! -d /var/run/openvswitch ]; then install -d -m 755 -o root -g root /var/run/openvswitch fi SSL_OPTS= case $LISTEN in *ssl*) : ${PRIVKEY:=/etc/openvswitch-controller/privkey.pem} : ${CERT:=/etc/openvswitch-controller/cert.pem} : ${CACERT:=/etc/openvswitch-controller/cacert.pem} if test ! -e "$PRIVKEY" || test ! -e "$CERT" || test ! -e "$CACERT"; then if test ! -e "$PRIVKEY"; then echo "$PRIVKEY: private key missing" >&2 fi if test ! -e "$CERT"; then echo "$CERT: certificate for private key missing" >&2 fi if test ! -e "$CACERT"; then echo "$CACERT: CA certificate missing" >&2 fi exit 1 fi SSL_OPTS="--private-key=$PRIVKEY --certificate=$CERT --ca-cert=$CACERT" ;; esac # Start the process using the wrapper if [ -z "$DAEMONUSER" ] ; then start-stop-daemon --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- --detach --pidfile=$PIDFILE \ $LISTEN $DAEMON_OPTS $SSL_OPTS errcode=$? else # if we are using a daemonuser then change the user id start-stop-daemon --start --quiet --pidfile $PIDFILE \ --chuid $DAEMONUSER --exec $DAEMON -- \ --detach --pidfile=$PIDFILE $LISTEN $DAEMON_OPTS \ $SSL_OPTS errcode=$? fi return $errcode } stop_server() { # Stop the process using the wrapper if [ -z "$DAEMONUSER" ] ; then start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --exec $DAEMON errcode=$? else # if we are using a daemonuser then look for process that match start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON errcode=$? fi return $errcode } reload_server() { [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` # This is the daemon's pid # Send a SIGHUP kill -1 $pid return $? } force_stop() { # Force the process to die killing it manually [ ! -e "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? sleep "$DODTIME" if running ; then kill -9 $pid sleep "$DODTIME" if running ; then echo "Cannot kill $NAME (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE } case "$1" in start) echo "Starting $DESC " "$NAME" # Check if it's running first if running ; then echo "apparently already running" exit 0 fi if start_server && running ; then # It's ok, the server started and is running : else # Either we could not start it or it is not running # after we did # NOTE: Some servers might die some time after they start, # this code does not try to detect this and might give # a false positive (use 'status' for that) : fi ;; stop) echo "Stopping $DESC" "$NAME" if running ; then # Only stop the server if we see it running stop_server else # If it's not running don't do anything echo "apparently not running" exit 0 fi ;; force-stop) # First try to stop gracefully the program $0 stop if running; then # If it's still running try to kill it more forcefully echo "Stopping (force) $DESC" "$NAME" force_stop fi ;; restart|force-reload) echo "Restarting $DESC" "$NAME" stop_server # Wait some sensible amount, some server need this [ -n "$DODTIME" ] && sleep $DODTIME start_server running ;; status) echo "Checking status of $DESC" "$NAME" if running ; then echo "running" else echo "apparently not running" exit 1 fi ;; # Use this if the daemon cannot reload reload) echo "Reloading $NAME daemon: not implemented, as the daemon" echo "cannot re-read the config file (use restart)." ;; *) N=/etc/init.d/openvswitch-controller echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2 exit 1 ;; esac exit 0 ++++++ openvswitch-controller.sysconfig ++++++ # This is a POSIX shell fragment -*- sh -*- # listen arguments # LISTEN="ptcp:" ++++++ openvswitch-ipsec.init ++++++ #!/bin/sh # # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs(a)debian.org> # # This is free software; you may redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2, # or (at your option) any later version. # # This is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License with # the Debian operating system, in /usr/share/common-licenses/GPL; if # not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA # ### BEGIN INIT INFO # Provides: openvswitch-ipsec # Required-Start: $network $local_fs $remote_fs openvswitch-switch # Required-Stop: $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Open vSwitch GRE-over-IPsec daemon ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/share/openvswitch/scripts/ovs-monitor-ipsec # Daemon's location NAME=ovs-monitor-ipsec # Introduce the short server's name here LOGDIR=/var/log/openvswitch # Log directory to use PIDFILE=/var/run/openvswitch/$NAME.pid test -x $DAEMON || exit 0 . /lib/lsb/init-functions DODTIME=10 # Time to wait for the server to die, in seconds # If this value is set too low you might not # let some servers to die gracefully and # 'restart' will not work set -e running_pid() { # Check if a given process pid's cmdline matches a given name pid=$1 name=$2 [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" " "|cut -d " " -f 2` # Is this the expected server [ "$cmd" != "$name" ] && return 1 return 0 } running() { # Check if the process is running looking at /proc # (works for all users) # No pidfile, probably no daemon present [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` running_pid $pid $DAEMON || return 1 return 0 } start_server() { if [ ! -d /var/run/openvswitch ]; then install -d -m 755 -o root -g root /var/run/openvswitch fi /usr/share/openvswitch/scripts/ovs-monitor-ipsec \ --pidfile=$PIDFILE --log-file --detach --monitor \ unix:/var/run/openvswitch/db.sock return 0 } stop_server() { if [ -e $PIDFILE ]; then kill `cat $PIDFILE` fi return 0 } force_stop() { # Force the process to die killing it manually [ ! -e "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? sleep "$DODTIME" if running ; then kill -9 $pid sleep "$DODTIME" if running ; then echo "Cannot kill $NAME (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE } case "$1" in start) log_daemon_msg "Starting $NAME" # Check if it's running first if running ; then log_progress_msg "apparently already running" log_end_msg 0 exit 0 fi if start_server && running ; then # It's ok, the server started and is running log_end_msg 0 else # Either we could not start it or it is not running # after we did # NOTE: Some servers might die some time after they start, # this code does not try to detect this and might give # a false positive (use 'status' for that) log_end_msg 1 fi ;; stop) log_daemon_msg "Stopping $NAME" if running ; then # Only stop the server if we see it running stop_server log_end_msg $? else # If it's not running don't do anything log_progress_msg "apparently not running" log_end_msg 0 exit 0 fi ;; force-stop) # First try to stop gracefully the program $0 stop if running; then # If it's still running try to kill it more forcefully log_daemon_msg "Stopping (force) $NAME" force_stop log_end_msg $? fi ;; restart|force-reload) log_daemon_msg "Restarting $NAME" stop_server # Wait some sensible amount, some server need this [ -n "$DODTIME" ] && sleep $DODTIME start_server running log_end_msg $? ;; status) log_daemon_msg "Checking status of $NAME" if running ; then log_progress_msg "running" log_end_msg 0 else log_progress_msg "apparently not running" log_end_msg 1 exit 1 fi ;; # Use this if the daemon cannot reload reload) log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" log_warning_msg "cannot re-read the config file (use restart)." ;; *) N=/etc/init.d/openvswitch-ipsec echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2 exit 1 ;; esac exit 0 ++++++ openvswitch-switch.init ++++++ #! /bin/sh # # Copyright (C) 2011 Nicira Networks, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # ### BEGIN INIT INFO # Provides: openvswitch-switch # Required-Start: $local_fs # Required-Stop: $local_fs # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Open vSwitch switch ### END INIT INFO (test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0 . /usr/share/openvswitch/scripts/ovs-lib test -e /etc/sysconfig/openvswitch-switch && . /etc/sysconfig/openvswitch-switch if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then BRCOMPAT=no log_warning_msg "ovs-brcompatd missing, disabling bridge compatibility" fi ovs_ctl () { set /usr/share/openvswitch/scripts/ovs-ctl "$@" if test X"$BRCOMPAT" = Xyes; then set "$@" --brcompat fi "$@" } load_kmod () { ovs_ctl load-kmod || exit $? } start () { if ovs_ctl load-kmod; then : else echo "Module has probably not been built for this kernel." if ! test -d /usr/share/doc/openvswitch-datapath-source; then echo "Install the openvswitch-datapath-source package, then read" else echo "For instructions, read" fi echo "/usr/share/doc/openvswitch-datapath-source/README.Debian" fi set ovs_ctl ${1-start} --system-id=random if test X"$FORCE_COREFILES" != X; then set "$@" --force-corefiles="$FORCE_COREFILES" fi "$@" || exit $? ovs_ctl --protocol=gre enable-protocol } stop () { ovs_ctl stop } case $1 in start) start ;; stop | force-stop) stop ;; reload | force-reload) # The OVS daemons keep up-to-date. ;; restart) stop start ;; status) ovs_ctl status ;; force-reload-kmod) start force-reload-kmod ;; load-kmod) load_kmod ;; *) echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop|force-reload-kmod|load-kmod}" >&2 exit 1 ;; esac exit 0 ++++++ openvswitch-switch.logrotate ++++++ /var/log/openvswitch/*.log { daily compress create 640 root adm delaycompress missingok rotate 30 postrotate # Tell Open vSwitch daemons to reopen their log files if [ -e /var/run/openvswitch/ovs-vswitchd.pid ]; then ovs-appctl --t ovs-vswitchd vlog/reopen fi if [ -e /var/run/openvswitch/ovsdb-server.pid ]; then ovs-appctl --t ovsdb-server vlog/reopen fi endscript } ++++++ openvswitch-switch.template ++++++ # This is a POSIX shell fragment -*- sh -*- # FORCE_COREFILES: If 'yes' then core files will be enabled. # FORCE_COREFILES=yes # BRCOMPAT: If 'yes' and the openvswitch-brcompat package is installed, then # Linux bridge compatibility will be enabled. # BRCOMPAT=no ++++++ preamble ++++++ Requires: kernel-%1 Enhances: kernel-%1 Supplements: packageand(kernel-%1:%{-n*}) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-swift for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-swift for openSUSE:Factory checked in at 2013-04-29 14:14:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-swift (Old) and /work/SRC/openSUSE:Factory/.openstack-swift.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-swift", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift-doc.changes 2013-01-30 11:18:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift-doc.changes 2013-04-29 14:14:54.000000000 +0200 @@ -2 +2 @@ -Wed Jan 30 07:11:43 UTC 2013 - cloud-devel(a)suse.de +Tue Apr 2 08:17:21 UTC 2013 - speilicke(a)suse.com @@ -4,2 +4,193 @@ -- Update to version 1.7.4.1+git.1359529903.0ce3e1d: - + Use pypi for python-swiftclient dependency. +- Update to version 1.8.0.rc2 + + additional unit test coverage for container/server.py + + Fixing SLO range requests + + fixed some minor things in tests that pyflakes complained about + + fixes some problems pyflakes complains about + + updated AUTHORS and CHANGELOG + + Dynamic Large Object sleeps too much + +-------------------------------------------------------------------- +Mon Mar 25 11:08:08 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Mon Mar 25 10:54:28 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Sun Mar 24 00:02:58 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.8.1+git.1364083378.a979c80: + + Fix for unicode issues in staticweb + + instruction command was not documented in right format. + + Fix bugs in bulk and slo and small doc change. + + Add support for Hash Prefix + +-------------------------------------------------------------------- +Thu Mar 21 15:44:33 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.8.1+git.1363880673.7df4323: + + Improved container-sync resiliency + + Give friendly notification in swift-get-nodes + + Permit functional tests against Swift with Keystone + + Fix crash in swift-ring-builder's list_parts command. + + Small clarification to swift-recon section of admin guide. + + swift-ring-builder blows up when not supported command requested. + + Basic ring builder validation. + + Instruction for multi node setup misses /var/run/swift creation + + increase unit test coverage on account server + + AUTHORS/CHANGELOG uploades for the next release + + version bump for 1.8.1 + + Use role in insensitive case in keystoneauth. + + fix stupid bug with bulk delete max items + + Fix misspelled variable. + + Fix for attempted COPY of objects gt MAX_FILE_SIZE + +-------------------------------------------------------------------- +Sun Mar 17 11:38:08 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1363520288.c2f8f00: + + Add tests and doc entry for request.environ[reseller_request] + + Add missing CONTRIBUTING.md to source tarball + + Add a region tier to Swift's ring. + + Fix swift-ring-builder's list_parts command. + + Remove check for valid Origin for the "actual request". + + Fix format device + +-------------------------------------------------------------------- +Wed Mar 13 00:03:14 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1363132994.f6d1fa1: + + Fixed bug with account_info + +-------------------------------------------------------------------- +Mon Mar 11 11:26:56 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Mon Mar 11 11:25:05 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1363001105.5e427e5: + + Account and container info fixes and improvement. + + timing-based affinity sorting for primary replicas + + Fixed formpost QUERY_STRING bugs. + + Adding speed limit options for DB auditor + + Allow acl with a valid token. + + Add tests on keystone for invalid path requests. + + Add cache=swift.cache for authtoken example. + + Make rings' replica counts adjustable. + + Improve bin/swift-account-audit + + Correct docstring for swift.common.ring.utils.build_tier_tree and add + + Fix descriptions in sample configs. + + Add debug level logs for TempAuth.authorize. + + Move the swift.1 manpage to python-swiftclient + + Account Server: Refactor HEAD request handler + + Force log entries to be one line + + Adding a quick note to helper functions so its clear what they do and + + Updating classifiers status to stable and clean up + + make swift fsync + + Added per disk PUT timing monitoring support. + + Remove reduant check of list. + + TempURL filename options; bug fixes + + Static Large Object Support + + Updated get_more_nodes algorithm + + David Hadas email address has been changed. + + Spread handoffs out better around zones. + + Fix misspelled variable name + + Support listing endpoints for an object. + + Support tests for Apache + + simplify the chexor function + + Fix some unreadable code. + + Account quotas + + Add exception to swift-drive-audit if no date in line. + +-------------------------------------------------------------------- +Sun Feb 24 18:17:55 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1361729875.d1381ba: + + Change in swift-drive-audit handling log rotation. + + Adds first-byte latency timings for GET requests. + + Documentation fixups + +------------------------------------------------------------------- +Fri Feb 22 11:31:31 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +-------------------------------------------------------------------- +Mon Feb 18 09:46:20 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1361180780.e88ff34: + + Make statsd sample rate behave better. + + Fixed bug in domain_remap and cname_lookup middleware + + Deprecate is_admin feature. + + Allow change the endpoint_type when use swift-dispersion tools + + Made internal client handle failed requests better + + Change the flag set to specify bulk delete and expand archives from a HTTP + + Fixed some swift-recon typos + + minor development doc changes + + Use a doubled proxy-logging instead of each middleware handling it + + Add generated keystone documentation to misc.rst. + + Replaces Copyright statements for LLC with Foundation, removes date. + + Fix spelling mistakes + + log message in exception level when path encoding errors happen. + + Swift MemcacheRing (set) interface is incompatible fixes + + fix large objects with unicode + + Cleanup of file permissions + +-------------------------------------------------------------------- +Mon Feb 4 14:40:22 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Mon Feb 4 12:02:01 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1359979321.ec084de: + + Fix keystoneauth with OPTIONS headers (eg: CORS) + + Add wsgify and split_path utilities to swob + + Add optional locking to swift-ring-builder + + Handle access_log_headers in proxy_logging + + Added fallocate_reserve option + + Allow rebalance to take a seed. + + Remove tempauth allowed_sync_hosts conf option + + Cleanup based on pyflakes. + + Deterministic, repeatable serialization for rings. + + Optimize the ring builder's _reassign_parts() method. + +-------------------------------------------------------------------- +Mon Jan 28 09:23:20 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1359365000.2f663ff: + + Allow for multiple X-(Account|Container)-* headers. + + Update auto-generated docs + + Add more command-line options to swift-bench. + + Add handler for CORS "actual requests" + + Bulk Requests: auto extract archive and bulk delete middleware. + +-------------------------------------------------------------------- +Wed Jan 23 16:41:31 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1358959291.f2941b0: + + Add --run-dir switch to swift-init + + Fix superfluous GET requests in swift-bench. + + prevent irregular auth_prefix config in tempauth + + Validate numericness of ports in builder files. + +-------------------------------------------------------------------- +Mon Jan 21 09:36:30 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1358760990.6c5fc3c: + + consistency and grammatical tweaks + + Fix HEAD request response when request not given to response. + + Fixed bug in object replicator + + Add container-sync to container-server.conf doc. + + Some optimizations for ring rebalancing. + + Make object-auditor to use one logger + + swob refactors needed for sos + + get swob.Request.blank to parse path + + authors and changelog update for swift 1.7.6 ++++ 1 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift-doc.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift-doc.changes --- /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift.changes 2013-01-30 11:18:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift.changes 2013-04-29 14:14:54.000000000 +0200 @@ -2 +2 @@ -Wed Jan 30 07:11:43 UTC 2013 - cloud-devel(a)suse.de +Tue Apr 2 08:17:21 UTC 2013 - speilicke(a)suse.com @@ -4 +4,284 @@ -- Update to version 1.7.4.1+git.1359529903.0ce3e1d: +- Update to version 1.8.0.rc2 + + additional unit test coverage for container/server.py + + Fixing SLO range requests + + fixed some minor things in tests that pyflakes complained about + + fixes some problems pyflakes complains about + + updated AUTHORS and CHANGELOG + + Dynamic Large Object sleeps too much + +-------------------------------------------------------------------- +Mon Mar 25 11:08:08 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Mon Mar 25 10:54:28 UTC 2013 - cloud-devel(a)suse.de + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Sun Mar 24 00:02:58 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.8.1+git.1364083378.a979c80: + + Fix for unicode issues in staticweb + + instruction command was not documented in right format. + + Fix bugs in bulk and slo and small doc change. + + Add support for Hash Prefix + +-------------------------------------------------------------------- +Thu Mar 21 15:44:33 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.8.1+git.1363880673.7df4323: + + Improved container-sync resiliency + + Give friendly notification in swift-get-nodes + + Permit functional tests against Swift with Keystone + + Fix crash in swift-ring-builder's list_parts command. + + Small clarification to swift-recon section of admin guide. + + swift-ring-builder blows up when not supported command requested. + + Basic ring builder validation. + + Instruction for multi node setup misses /var/run/swift creation + + increase unit test coverage on account server + + AUTHORS/CHANGELOG uploades for the next release + + version bump for 1.8.1 + + Use role in insensitive case in keystoneauth. + + fix stupid bug with bulk delete max items + + Fix misspelled variable. + + Fix for attempted COPY of objects gt MAX_FILE_SIZE + +-------------------------------------------------------------------- +Sun Mar 17 11:38:08 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1363520288.c2f8f00: + + Add tests and doc entry for request.environ[reseller_request] + + Add missing CONTRIBUTING.md to source tarball + + Add a region tier to Swift's ring. + + Fix swift-ring-builder's list_parts command. + + Remove check for valid Origin for the "actual request". + + Fix format device + +-------------------------------------------------------------------- +Wed Mar 13 00:03:14 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1363132994.f6d1fa1: + + Fixed bug with account_info + +-------------------------------------------------------------------- +Mon Mar 11 11:26:56 UTC 2013 - dmueller(a)suse.com + +- Start using obs-service-github_tarballs + +-------------------------------------------------------------------- +Mon Mar 11 11:25:05 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1363001105.5e427e5: + + Account and container info fixes and improvement. + + timing-based affinity sorting for primary replicas + + Fixed formpost QUERY_STRING bugs. + + Adding speed limit options for DB auditor + + Allow acl with a valid token. + + Add tests on keystone for invalid path requests. + + Add cache=swift.cache for authtoken example. + + Make rings' replica counts adjustable. + + Improve bin/swift-account-audit + + Correct docstring for swift.common.ring.utils.build_tier_tree and add + + Fix descriptions in sample configs. + + Add debug level logs for TempAuth.authorize. + + Move the swift.1 manpage to python-swiftclient + + Account Server: Refactor HEAD request handler + + Force log entries to be one line + + Adding a quick note to helper functions so its clear what they do and + + Updating classifiers status to stable and clean up + + make swift fsync + + Added per disk PUT timing monitoring support. + + Remove reduant check of list. + + TempURL filename options; bug fixes + + Static Large Object Support + + Updated get_more_nodes algorithm + + David Hadas email address has been changed. + + Spread handoffs out better around zones. + + Fix misspelled variable name + + Support listing endpoints for an object. + + Support tests for Apache + + simplify the chexor function + + Fix some unreadable code. + + Account quotas + + Add exception to swift-drive-audit if no date in line. + +-------------------------------------------------------------------- +Sun Feb 24 18:17:55 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1361729875.d1381ba: + + Change in swift-drive-audit handling log rotation. + + Adds first-byte latency timings for GET requests. + + Documentation fixups + +------------------------------------------------------------------- +Fri Feb 22 11:31:18 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +-------------------------------------------------------------------- +Mon Feb 18 09:46:20 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1361180780.e88ff34: + + Make statsd sample rate behave better. + + Fixed bug in domain_remap and cname_lookup middleware + + Deprecate is_admin feature. + + Allow change the endpoint_type when use swift-dispersion tools + + Made internal client handle failed requests better + + Change the flag set to specify bulk delete and expand archives from a HTTP + + Fixed some swift-recon typos + + minor development doc changes + + Use a doubled proxy-logging instead of each middleware handling it + + Add generated keystone documentation to misc.rst. + + Replaces Copyright statements for LLC with Foundation, removes date. + + Fix spelling mistakes + + log message in exception level when path encoding errors happen. + + Swift MemcacheRing (set) interface is incompatible fixes + + fix large objects with unicode + + Cleanup of file permissions + +-------------------------------------------------------------------- +Thu Feb 7 12:19:04 UTC 2013 - saschpe(a)suse.de + +- Update test configuration: + + Use correct storage location + +-------------------------------------------------------------------- +Thu Feb 7 11:28:29 UTC 2013 - saschpe(a)suse.de + +- Update to version 1.7.7+git.1360236509.9f14161: + + Fixes 'not in' operator usage + + Basic container quotas +- Fetch test configuration from SUSE-Cloud github repository + +-------------------------------------------------------------------- +Mon Feb 4 12:02:01 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1359979321.ec084de: + + Fix keystoneauth with OPTIONS headers (eg: CORS) + + Add wsgify and split_path utilities to swob + + Add optional locking to swift-ring-builder + + Handle access_log_headers in proxy_logging + + Added fallocate_reserve option + + Allow rebalance to take a seed. + + Remove tempauth allowed_sync_hosts conf option + + Cleanup based on pyflakes. + + Deterministic, repeatable serialization for rings. + + Optimize the ring builder's _reassign_parts() method. + +-------------------------------------------------------------------- +Mon Jan 28 09:23:20 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1359365000.2f663ff: + + Allow for multiple X-(Account|Container)-* headers. + + Update auto-generated docs + + Add more command-line options to swift-bench. + + Add handler for CORS "actual requests" + + Bulk Requests: auto extract archive and bulk delete middleware. + +-------------------------------------------------------------------- +Wed Jan 23 16:41:31 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 1.7.7+git.1358959291.f2941b0: + + Add --run-dir switch to swift-init + + Fix superfluous GET requests in swift-bench. + + prevent irregular auth_prefix config in tempauth + + Validate numericness of ports in builder files. + +-------------------------------------------------------------------- +Mon Jan 21 09:36:30 UTC 2013 - dmueller(a)suse.com + +- Update to version 1.7.7+git.1358760990.6c5fc3c: + + consistency and grammatical tweaks ++++ 176 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-swift/openstack-swift.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-swift.new/openstack-swift.changes Old: ---- swift-stable-folsom.tar.gz test-configs.tar.bz2 New: ---- swift-1.8.0.rc2.tar.gz swift-test-configs-0.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-swift-doc.spec ++++++ --- /var/tmp/diff_new_pack.gc0mDx/_old 2013-04-29 14:14:56.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0mDx/_new 2013-04-29 14:14:56.000000000 +0200 @@ -19,18 +19,18 @@ %define component swift Name: openstack-%{component}-doc -Version: 1.7.4.1+git.1359529903.0ce3e1d -Release: 1 -License: Apache-2.0 +Version: 1.8.0.rc2 +Release: 0 Summary: OpenStack Storage (Swift) - Documentation -Url: http://openstack.org/projects/compute/ +License: Apache-2.0 Group: Documentation/HTML -Source: swift-stable-folsom.tar.gz -BuildRequires: openstack-macros +Url: http://openstack.org/projects/compute/ +Source: swift-1.8.0.rc2.tar.gz +BuildRequires: openstack-suse-macros +BuildRequires: python-PasteDeploy BuildRequires: python-Sphinx BuildRequires: python-eventlet BuildRequires: python-netifaces -BuildRequires: python-PasteDeploy BuildRequires: python-simplejson BuildRequires: python-swiftclient BuildRequires: python-webob @@ -47,7 +47,7 @@ This package contains documentation files for openstack-swift. %prep -%setup -q -n swift-1.7.4.1 +%setup -q -n swift-1.8.0 sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning %openstack_cleanup_prep ++++++ openstack-swift.spec ++++++ --- /var/tmp/diff_new_pack.gc0mDx/_old 2013-04-29 14:14:56.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0mDx/_new 2013-04-29 14:14:56.000000000 +0200 @@ -21,13 +21,13 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 1.7.4.1+git.1359529903.0ce3e1d -Release: 1 -License: Apache-2.0 +Version: 1.8.0.rc2 +Release: 0 Summary: OpenStack Storage (Swift) -Url: http://launchpad.net/swift +License: Apache-2.0 Group: Development/Languages/Python -Source: swift-stable-folsom.tar.gz +Url: http://launchpad.net/swift +Source: swift-1.8.0.rc2.tar.gz Source1: %{name}-functions Source2: %{name}-account.init Source3: %{name}-account-auditor.init @@ -44,25 +44,14 @@ Source14: %{name}-object-updater.init Source15: %{name}-object-auditor.init Source16: %{name}-proxy.init -Source21: test-configs.tar.bz2 +Source21: swift-test-configs-0.0.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes -BuildRequires: openstack-macros -BuildRequires: python-coverage +BuildRequires: openstack-suse-macros BuildRequires: python-devel BuildRequires: python-distribute Requires: python >= 2.6.8 -Requires: python-WebOb >= 1.0.8 -#Requires: python-WebOb < 1.3 -Requires: python-PasteDeploy -Requires: python-configobj -Requires: python-eventlet >= 0.9.15 -Requires: python-greenlet >= 0.3.1 -Requires: python-netifaces -Requires: python-simplejson Requires: python-swift = %{version} -Requires: python-swiftclient -Requires: python-xattr Requires: rsync Requires(post): %insserv_prereq %if 0%{?suse_version} > 1110 @@ -90,15 +79,22 @@ more expensive equipment. %package -n python-swift + Summary: OpenStack Storage (Swift) - Python module Group: Development/Languages/Python Requires: python >= 2.6.8 -Requires: python-netifaces +Requires: python-eventlet >= 0.9.15 +Requires: python-greenlet >= 0.3.1 +Requires: python-netifaces >= 0.5 +Requires: python-simplejson >= 2.0.9 +Requires: python-swiftclient +Requires: python-xattr >= 0.4 %description -n python-swift This package contains the core Python module of OpenStack Swift. %package account + Summary: OpenStack Storage (Swift) - Account Server Group: Productivity/Clustering/Computing Requires: %{name} = %{version} @@ -112,6 +108,7 @@ This package contains the openstack-swift account server. %package container + Summary: OpenStack Storage (Swift) - Container Server Group: Productivity/Clustering/Computing Requires: %{name} = %{version} @@ -125,6 +122,7 @@ This package contains the openstack-swift container server. %package object + Summary: OpenStack Storage (Swift) - Object Server Group: Productivity/Clustering/Computing Requires: %{name} = %{version} @@ -138,6 +136,7 @@ This package contains the openstack-swift object server. %package proxy + Summary: OpenStack Storage (Swift) - Proxy Server Group: Productivity/Clustering/Computing Requires: %{name} = %{version} @@ -151,23 +150,24 @@ This package contains the openstack-swift proxy server. %package test + Summary: OpenStack Storage (Swift) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python-coverage +Requires: python-mock >= 0.8.0 Requires: python-nose +Requires: python-nosehtmloutput Requires: python-nosexcover Requires: python-openstack.nose_plugin -Requires: python-nosehtmloutput Requires: python-pep8 -Requires: python-Sphinx >= 1.1.2 %description test The OpenStack Swift testsuite. It is used to verify the functionality of OpenStack Swift. %prep -%setup -q -n swift-1.7.4.1 +%setup -q -n swift-1.8.0 sed -i "s/\r//" LICENSE # Fix wrong-file-end-of-line-encoding warning tar xvf %{SOURCE21} %openstack_cleanup_prep @@ -239,7 +239,7 @@ # test sub-package %openstack_test_package_install -cp -r test-configs/* %{buildroot}/ +cp -r swift-test-configs-*/* %{buildroot}/ # For ./.unittests: install -m 0644 test/sample.conf %{buildroot}%{_sysconfdir}/swift/test.conf # For ./.functests: @@ -294,7 +294,7 @@ %files %defattr(-,root,root,-) -%doc README +%doc README.md %dir %{_datadir}/%{name}/functions %if 0%{?suse_version} < 1130 %dir %attr(0755, %{username}, root) %{_localstatedir}/run/swift @@ -303,6 +303,7 @@ %dir %{_datadir}/openstack-swift %{_bindir}/swift-account-audit %{_bindir}/swift-bench +%{_bindir}/swift-bench-client %{_bindir}/swift-dispersion-populate %{_bindir}/swift-dispersion-report %{_bindir}/swift-drive-audit @@ -315,7 +316,6 @@ %{_bindir}/swift-recon-cron %{_bindir}/swift-ring-builder %{_bindir}/swift-temp-url -%{_mandir}/man1/swift.1.gz %{_mandir}/man1/swift-dispersion-populate.1.gz %{_mandir}/man1/swift-dispersion-report.1.gz %{_mandir}/man1/swift-get-nodes.1.gz @@ -381,6 +381,7 @@ %dir %attr(0755, %{username}, root) %{_localstatedir}/run/swift/object-server %endif %dir %{_sysconfdir}/swift/object-server +%{_sysconfdir}/swift/object-expirer.conf %{_bindir}/swift-object-auditor %{_bindir}/swift-object-expirer %{_bindir}/swift-object-info ++++++ _service ++++++ --- /var/tmp/diff_new_pack.gc0mDx/_old 2013-04-29 14:14:56.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0mDx/_new 2013-04-29 14:14:56.000000000 +0200 @@ -1,9 +1,21 @@ <services> <service name="github_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/swift/swift-stable-folsom.tar.gz</param> - <param name="email">cloud-devel(a)suse.de</param> + <param name="url">http://tarballs.openstack.org/swift/swift-1.8.0.rc2.tar.gz</param> + <param name="email">opensuse-cloud(a)opensuse.org</param> <param name="repo_owner">openstack</param> <param name="repo_name">swift</param> - <param name="target">stable/folsom</param> + <param name="target">master</param> + </service> + + <service name="tar_scm" mode="disabled"> + <param name="url">git://github.com/SUSE-Cloud/swift-test-configs.git</param> + <param name="scm">git</param> + <param name="exclude">.git</param> + <param name="versionformat">0.0.0</param> + <param name="revision">master</param> + </service> + <service name="recompress" mode="disabled"> + <param name="file">swift-test-configs-*.tar</param> + <param name="compression">bz2</param> </service> </services> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-suse for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-suse for openSUSE:Factory checked in at 2013-04-29 14:13:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-suse (Old) and /work/SRC/openSUSE:Factory/.openstack-suse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-suse", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-suse.new/openstack-suse.changes 2013-04-29 14:13:58.000000000 +0200 @@ -0,0 +1,33 @@ +------------------------------------------------------------------- +Mon Mar 18 18:35:36 UTC 2013 - dmueller(a)suse.com + +- copy PKG-INFO as well for nova testsuite + +------------------------------------------------------------------- +Mon Feb 25 13:00:25 UTC 2013 - saschpe(a)suse.de + +- Expand openstack_test_package_install macro to include horizon-specific + files + +------------------------------------------------------------------- +Fri Feb 22 10:14:46 UTC 2013 - saschpe(a)suse.de + +- Renamed to openstack-suse to avoid confusion with upstream openstack-common + +------------------------------------------------------------------- +Fri Jan 25 10:48:00 UTC 2013 - saschpe(a)suse.de + +- (Build)Require sudo in the openstack-commons-sudo package +- Only create /etc/sudoers.d on SLE_11_SP2 + +------------------------------------------------------------------- +Fri Jan 25 07:45:53 UTC 2013 - saschpe(a)suse.de + +- Install /etc/sudoers.d on SLE +- Added rpmlintrc + +------------------------------------------------------------------- +Thu Jan 24 16:41:47 UTC 2013 - saschpe(a)suse.de + +- Initial version + New: ---- macros.openstack openstack-skeleton.init openstack-suse.changes openstack-suse.spec rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-suse.spec ++++++ # # spec file for package openstack-suse # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: openstack-suse Version: 2013.11 Release: 0 Summary: OpenStack SUSE License: Apache-2.0 Group: Development/Libraries/Python Url: https://www.suse.com/products/suse-cloud/ Source1: macros.openstack Source2: openstack-skeleton.init Requires: %{name}-sudo = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: openstack-suse-macros = %{version} Requires: openstack-suse-sudo = %{version} #NOTE(saschpe): We don't provide openstack-common here to not # collide with upstream, sorry: #Provides: openstack-common = %%{version} #Obsoletes: openstack-common < %%{version} %description This packages pulls in various other utility packages that are mainly useful for OpenStack packaging. Some are even only used at build-time. %package macros Summary: OpenStack SUSE - RPM Macros Group: Development/Libraries/Python Provides: openstack-macros = %{version} Obsoletes: openstack-macros < %{version} Provides: openstack-common-macros = %{version} Obsoletes: openstack-common-macros < %{version} %description macros This package provides OpenStack RPM macros. You need it to build OpenStack packages. %package sudo Summary: OpenStack SUSE - Sudo Support Group: Development/Libraries/Python # For directory ownership: BuildRequires: sudo Requires: sudo Provides: openstack-common-sudo = %{version} Obsoletes: openstack-common-sudo < %{version} %description sudo OpenStack packages install sudo configuration files for rootwrap binaries in /etc/sudoers.d. This directory is disabled by default, thus this package enables it in /etc/sudoers. %prep %build %install # Make the base package non-empty for now: echo "OpenStack SUSE" > README # Macros sub-package install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.openstack install -D -m755 %{SOURCE2} %{buildroot}%{_initddir}/openstack-skeleton # Sudo sub-package, SLES sudo doesn't own /etc/sudoers.d, openSUSE-12.2 and later does: %if 0%{?suse_version} && 0%{?suse_version} <= 1110 install -d %{buildroot}%{_sysconfdir}/sudoers.d %endif # SLE_11_SP2 sudo package doesn't include this directory: %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %post sudo if ! grep -qE "^#includedir /etc/sudoers.d" /etc/sudoers ; then echo "#includedir /etc/sudoers.d" >> /etc/sudoers fi %postun sudo sed -i "/^includedir \/etc\/sudoers\.d/d" /etc/sudoers %endif %files macros %defattr(-,root,root) %{_sysconfdir}/rpm/macros.openstack %{_initddir}/openstack-skeleton %files sudo %defattr(-,root,root) # SLE_11_SP2 sudo package doesn't create this directory, thus we have to own it: %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %dir %attr(0750, root, root) %{_sysconfdir}/sudoers.d %endif %changelog ++++++ macros.openstack ++++++ # Macros for building OpenStack RPMs. # # 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): %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 \ %nil # If you only want to build man-pages, this macro is better than # 'setup.py build_sphinx': it's slow and will generate errors. Instead, # directly call sphinx-build on a copy of the man pages sources (to # avoid having other docs to build) %openstack_sphinx_build_manpages_only() \ mkdir doc/source-man \ cp -a doc/source/{conf.py,man} doc/source-man/ \ sphinx-build -b man doc/source-man/ doc/build/man/ \ rm -r doc/source-man doc/build/man/.doctrees \ %nil # Installing init scripts is always done the same way. Arguments: # 1) daemon name (lowercase, e.g. 'api' for 'nova-api') # # Flags: # -d Description # -s Should-Start/Stop LSB header content (optional, e.g 'rabbitmq-server postgresql') %openstack_init_script_install(:d:s:) \ %define desc %{-d*}%{!-d:OpenStack} (%1) \ %define should %{-s*}%{!-s: } \ mkdir -p %{buildroot}%{_sbindir} \ tmp=$(mktemp) \ cat /etc/init.d/openstack-skeleton | sed -e "s/__COMPONENT__/%{component}/g" -e "s/__DAEMON__/%1/g" -e "s/__DESC__/%desc/g" > $tmp \ sed -i -e "s/__SHOULD__/%should/" $tmp \ install -D -m 755 $tmp %{buildroot}%{_initddir}/openstack-%{component}-%1 \ ln -s ../..%{_initddir}/openstack-%{component}-%1 %{buildroot}%{_sbindir}/rcopenstack-%{component}-%1 \ %nil # Installing a test package is always done the same way: %openstack_test_package_install() \ install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}-test \ # 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} \ %nil # To generate self-signed certificates to be used in (demo) setups # with Apache2, you can use the following set of macros: #NOTE: This one can't really be used in practice, the "build" script doesn't know this # macro, it would have to be put into the PrjConf, which doesn't seem worth it: %openstack_apache_ssl_cert_requires() \ Requires(post): apache2-utils \ Requires(post): openssl \ Requires(post): sysconfig \ %nil %openstack_apache_ssl_cert_install() \ install -d %{buildroot}%{_sysconfdir}/apache2/ssl.{crt,csr,key} \ install -d %{buildroot}/srv/www/htdocs \ touch %{buildroot}%{_sysconfdir}/apache2/ssl.key/%{name}-{ca,server}.key \ touch %{buildroot}%{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr \ touch %{buildroot}%{_sysconfdir}/apache2/ssl.crt/%{name}-{ca,server}.crt \ %nil #TODO: Parameterize so that one can set a custom domain, etc. %openstack_apache_ssl_cert_post() \ if [ ! -s %{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr ] ; then \ (umask 377 ; /usr/bin/gensslcert -C %{name} -n %{name}.example.com) \ fi \ %nil %openstack_apache_ssl_cert_files() \ %ghost %{_sysconfdir}/apache2/ssl.key/%{name}-*.key \ %ghost %{_sysconfdir}/apache2/ssl.csr/%{name}-server.csr \ %ghost %{_sysconfdir}/apache2/ssl.crt/%{name}-*.crt \ %nil ++++++ openstack-skeleton.init ++++++ #!/bin/sh ### BEGIN INIT INFO # Provides: openstack-__COMPONENT__-__DAEMON__ # Required-Start: $network $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: __SHOULD__ # Should-Stop: __SHOULD__ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: __DESC__ # Description: __DESC__ ### END INIT INFO USER="openstack-__COMPONENT__" FLAGFILE="/etc/__COMPONENT__/__COMPONENT__.conf" LOGFILE="/var/log/__COMPONENT__/__DAEMON__.log" [ -e "/etc/sysconfig/__COMPONENT__-__DAEMON__" ] && . "/etc/sysconfig/__COMPONENT__-__DAEMON__" [ -e $LOGFILE ] || touch $LOGFILE && chown $USER. $LOGFILE # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status case "$1" in start) echo -n "Starting __COMPONENT__-__DAEMON__" startproc -s -u $USER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/__COMPONENT__-__DAEMON__ --flagfile=$FLAGFILE --logfile=$LOGFILE rc_status -v ;; stop) echo -n "Shutting down __COMPONENT__-__DAEMON__" killproc /usr/bin/__COMPONENT__-__DAEMON__ rc_status -v ;; restart) $0 stop $0 start rc_status ;; reload) ;; status) echo -n "Checking __COMPONENT__-__DAEMON__" /sbin/checkproc /usr/bin/__COMPONENT__-__DAEMON__ rc_status -v ;; condrestart|try-restart) if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi rc_status ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" exit 2 esac exit $? ++++++ rpmlintrc ++++++ # RPM macros are not configuration: addFilter("non-conffile-in-etc /etc/rpm/macros.openstack") # The skeleton init script is just a skeleton, thus: addFilter("non-conffile-in-etc /etc/init.d/openstack-skeleton") addFilter("incoherent-init-script-name openstack-skeleton") addFilter("suse-missing-rclink openstack-skeleton") addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/openstack-skeleton") addFilter("init-script-without-%restart_on_update-postun /etc/init.d/openstack-skeleton") addFilter("init-script-without-%insserv_cleanup-postun /etc/init.d/openstack-skeleton") # NOTE(saschpe): Let's have an empty base package for now. We # reserve that as the chef-based openstack-quickstart replacement: addFilter("openstack-suse-sudo.noarch: W: suse-filelist-empty") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-quickstart for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-quickstart for openSUSE:Factory checked in at 2013-04-29 14:10:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old) and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-quickstart", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes 2013-03-25 20:41:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes 2013-04-29 14:10:22.000000000 +0200 @@ -2 +2 @@ -Fri Mar 15 11:09:05 UTC 2013 - cloud-devel(a)suse.de +Sun Mar 17 00:16:08 UTC 2013 - cloud-devel(a)suse.de @@ -4 +4 @@ -- Update to latest git (96c1d32): +- Update to latest git (cf8af8b): @@ -8 +8 @@ -Mon Mar 11 12:58:48 UTC 2013 - cloud-devel(a)suse.de +Mon Mar 11 13:05:30 UTC 2013 - cloud-devel(a)suse.de @@ -10 +10,2 @@ -- Update to latest git (657d782): +- Update to latest git (9b7cd13): + + Run *-manage tools as the respective user for each service @@ -14 +15 @@ -Thu Feb 7 18:38:37 UTC 2013 - cloud-devel(a)suse.de +Mon Mar 11 10:03:15 UTC 2013 - cloud-devel(a)suse.de @@ -16,3 +17,3 @@ -- Update to latest git (cb0fbe8): - + Enalbe Cinder and Swift Service endpoints - + Setup Cinder properly +- Update to latest git (073d42e): + + Only install postgresql91-server on SLE11, not on openSUSE + + Fix typo that was breaking the "nova secgroup-*" calls at the end @@ -21 +22 @@ -Wed Jan 30 07:48:46 UTC 2013 - cloud-devel(a)suse.de +Fri Mar 8 09:09:10 UTC 2013 - vuntz(a)suse.com @@ -23,2 +24,57 @@ -- Update to latest git (95d7088): - + Fill in values in the cinder/api-paste.ini templatae +- Add patterns-OpenStack-clients and + patterns-OpenStack-network-node Suggests as we'll get them + installed with the demosetup script. + +------------------------------------------------------------------- +Tue Mar 5 16:56:53 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (943d412): + + Don't set keystone catalog default driver. + + Don't chown /var/lib/keystone. + + Don't set glance flavour=keystone, done in package + + Use openstack-config for setting lxc libvirt_type. + + Shameless tab-killing spree + +------------------------------------------------------------------- +Thu Feb 14 16:17:16 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (fab4032): + + Don't fix keystone/glance directory ownership errors here + + Set nova.volume.cinder.API as nova's volume_api_class + + Revert "Set nova.volume.cinder.API as nova's volume_api_class" + + less error messages during execution + + use openstack-config to setup values + + cleanup + + also start the quantum server + + also install clients and network node pattern + +------------------------------------------------------------------- +Thu Feb 7 18:05:01 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (1df2290): + + abort if a package couldn't be installed + + Configure Cinder properly + + Enable Cinder, Quantum, Swift and Heat Service endpoints + +------------------------------------------------------------------- +Thu Feb 7 14:53:44 UTC 2013 - dmueller(a)suse.com + +- require openstack-utils for the demosetup + +------------------------------------------------------------------- +Mon Feb 4 14:40:00 UTC 2013 - cloud-devel(a)suse.de + +- Update to latest git (0b1ec58): + + openstack dashboard moved to /usr/share + + Stop manipulating /etc/sudoers. + +------------------------------------------------------------------- +Wed Jan 23 09:23:10 UTC 2013 - saschpe(a)suse.de + +- Update to latest git (d3a5de9): + + Lotsa fixes + +------------------------------------------------------------------- +Mon Jan 14 15:08:31 UTC 2013 - saschpe(a)suse.de + +- Move to master branch (from stable/folsom) Old: ---- openstack-quickstart-2012.2+git.1363345658.96c1d32.tar.gz New: ---- openstack-quickstart-2013.1+git.1363345119.cf8af8b.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-quickstart.spec ++++++ --- /var/tmp/diff_new_pack.M410hC/_old 2013-04-29 14:10:24.000000000 +0200 +++ /var/tmp/diff_new_pack.M410hC/_new 2013-04-29 14:10:24.000000000 +0200 @@ -16,17 +16,19 @@ # - Name: openstack-quickstart -Version: 2012.2+git.1363345658.96c1d32 +Version: 2013.1+git.1363345119.cf8af8b Release: 0 -License: MIT Summary: OpenStack Quickstart -Url: http://en.opensuse.org/SDB:Cloud_OpenStack_Quickstart +License: MIT Group: System/Management +Url: http://en.opensuse.org/SDB:Cloud_OpenStack_Quickstart Source0: %{name}-%{version}.tar.gz +Suggests: patterns-OpenStack-clients Suggests: patterns-OpenStack-compute-node Suggests: patterns-OpenStack-controller +Suggests: patterns-OpenStack-network-node +Requires: openstack-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.M410hC/_old 2013-04-29 14:10:24.000000000 +0200 +++ /var/tmp/diff_new_pack.M410hC/_new 2013-04-29 14:10:24.000000000 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param> - <param name="revision">stable/folsom</param> + <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> ++++++ openstack-quickstart-2012.2+git.1363345658.96c1d32.tar.gz -> openstack-quickstart-2013.1+git.1363345119.cf8af8b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-loopback-lvm new/openstack-quickstart-2013.1+git.1363345119.cf8af8b/scripts/openstack-loopback-lvm --- old/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-loopback-lvm 2013-03-15 12:06:42.000000000 +0100 +++ new/openstack-quickstart-2013.1+git.1363345119.cf8af8b/scripts/openstack-loopback-lvm 2013-03-17 01:16:07.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -f=/var/lib/nova/volumes +f=/var/lib/cinder/volumes loop=/dev/loop0 modprobe loop @@ -15,10 +15,18 @@ vgchange -an cinder-volumes #losetup -d $loop +# cleanup old nova-volumes volume group +if vgscan | grep -q nova-volumes ; then + echo "cleaning up old nova-volumes VG" + vgchange -an nova-volumes + vgremove nova-volumes + losetup -d $loop +fi + if ! test -e $f ; then # calc wanted size - size=$(df -P -k /var/lib/nova/|tail -1| perl -ne 'm/^\S+\s*\d+\s+\d+\s+(\d+)/; print int($1*0.3)') + size=$(df -P -k /var/lib/cinder/|tail -1| perl -ne 'm/^\S+\s*\d+\s+\d+\s+(\d+)/; print int($1*0.3)') if [ $size -le 2000000 ] ; then echo "error detecting free space or FS too small: $size KB" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-demosetup new/openstack-quickstart-2013.1+git.1363345119.cf8af8b/scripts/openstack-quickstart-demosetup --- old/openstack-quickstart-2012.2+git.1363345658.96c1d32/scripts/openstack-quickstart-demosetup 2013-03-15 12:09:05.000000000 +0100 +++ new/openstack-quickstart-2013.1+git.1363345119.cf8af8b/scripts/openstack-quickstart-demosetup 2013-03-17 01:16:08.000000000 +0100 @@ -13,23 +13,39 @@ KEYSTONE_SYSTEM_GROUP=openstack-keystone GLANCE_SYSTEM_USER=openstack-glance GLANCE_SYSTEM_GROUP=openstack-glance +CINDER_SYSTEM_USER=openstack-cinder +CINDER_SYSTEM_GROUP=openstack-cinder +QUANTUM_SYSTEM_USER=openstack-quantum +QUANTUM_SYSTEM_GROUP=openstack-quantum +NOVA_SYSTEM_USER=openstack-nova +NOVA_SYSTEM_GROUP=openstack-nova HORIZON_SYSTEM_USER=openstack-horizon echo "Setting up OpenStack demo controller..." function install_packages () { - test $# -gt 0 || return - rpm -q $* > /dev/null || zypper -n in $* + test $# -gt 0 || return + rpm -q $* > /dev/null || zypper -n in $* || exit 1 } -install_packages patterns-OpenStack-controller patterns-OpenStack-compute-node +function run_as () { + test $# -eq 2 || (echo "Bad usage of run_as function. Arguments: $*"; exit 1) + su - $1 -s /bin/bash -c "$2" +} + +install_packages patterns-OpenStack-controller patterns-OpenStack-compute-node patterns-OpenStack-clients patterns-OpenStack-network-node if [ "$DB" = "postgresql" ] ; then - install_packages postgresql-server python-psycopg2 - /etc/init.d/postgresql restart + grep -q "SUSE Linux Enterprise Server 11" /etc/SuSE-release + if test $? -eq 0; then + install_packages postgresql91-server python-psycopg2 + else + install_packages postgresql-server python-psycopg2 + fi + /etc/init.d/postgresql restart else - # start mysql - /etc/init.d/mysql start + # start mysql + /etc/init.d/mysql start fi @@ -37,14 +53,15 @@ # use lxc or qemu, if kvm is unavailable if rpm -q openstack-nova-compute >/dev/null ; then if [ "$MODE" = lxc ] ; then - sed -i -e 's/$libvirt_type$.*/\1=lxc/' /etc/nova/nova.conf - install_packages lxc - echo mount -t cgroup none /cgroup >> /etc/init.d/boot.local - mkdir /cgroup - mount -t cgroup none /cgroup + openstack-config --set /etc/nova/nova.conf DEFAULT libvirt_type lxc + install_packages lxc + # not sure what this is good for, cgroups is and should be mounted under /sys/fs/cgroup + #echo mount -t cgroup none /cgroup >> /etc/init.d/boot.local + #mkdir /cgroup + #mount -t cgroup none /cgroup else - modprobe kvm-intel ; modprobe kvm-amd - sed -i -e 's/$MODULES_LOADED_ON_BOOT="$/\1kvm-intel kvm-amd\ /' /etc/sysconfig/kernel + modprobe kvm-intel ; modprobe kvm-amd + sed -i -e 's/$MODULES_LOADED_ON_BOOT="$/\1kvm-intel kvm-amd\ /' /etc/sysconfig/kernel fi modprobe nbd sed -i -e 's/$MODULES_LOADED_ON_BOOT="$/\1nbd\ /' /etc/sysconfig/kernel @@ -57,12 +74,12 @@ # configure bridge if [ ! -e /etc/sysconfig/network/ifcfg-$br ] ; then - echo "net.ipv4.conf.all.proxy_arp = 1" >> /etc/sysctl.conf - /etc/init.d/network stop - ifdown eth0 # because systemd ignores the above - sed -i -e "s/$BOOTPROTO$.*/\1='static'/" \ - -e "s|^$IPADDR$.*|\1='0.0.0.0\\/32'|" /etc/sysconfig/network/ifcfg-eth0 - cat >/etc/sysconfig/network/ifcfg-$br <<EOF + echo "net.ipv4.conf.all.proxy_arp = 1" >> /etc/sysctl.conf + /etc/init.d/network stop + ifdown eth0 # because systemd ignores the above + sed -i -e "s/$BOOTPROTO$.*/\1='static'/" \ + -e "s|^$IPADDR$.*|\1='0.0.0.0\\/32'|" /etc/sysconfig/network/ifcfg-eth0 + cat >/etc/sysconfig/network/ifcfg-$br <<EOF BOOTPROTO='dhcp4' BRIDGE='yes' BRIDGE_FORWARDDELAY='0' @@ -78,49 +95,24 @@ STARTMODE='onboot' USERCONTROL='no' EOF - /etc/init.d/network start + /etc/init.d/network start fi -# configure dashboard/apache -cat >/etc/apache2/conf.d/openstack-dashboard.conf <<EOF -<IfDefine SSL> - RewriteEngine On - RewriteCond %{SERVER_PORT} !^443$ - RewriteRule / https://%{HTTP_HOST}%{REQUEST_URI} [L,R] - - <VirtualHost *:443> - ServerName www.example.com - ServerAdmin webmaster(a)example.com - - SSLEngine On - SSLCertificateFile /etc/apache2/ssl.crt/openstack-dashboard-server.crt - SSLCertificateKeyFile /etc/apache2/ssl.key/openstack-dashboard-server.key - - DocumentRoot /var/lib/openstack-dashboard/ - - WSGIScriptAlias / /var/lib/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi - <Directory /var/lib/openstack-dashboard/openstack_dashboard/wsgi/> - Order allow,deny - Allow from all - </Directory> - </VirtualHost> -</IfDefine> -EOF +# configure dashboard/apache sample configuration from the package: +install -m 644 /etc/apache2/conf.d/openstack-dashboard.conf{.sample,} a2enmod rewrite a2enmod ssl a2enmod wsgi a2enflag SSL -DASHBOARD_LOCAL_SET=/var/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py -if grep -q "^\s*CACHE_BACKEND" $DASHBOARD_LOCAL_SET -then - sed -i "s|^\s*CACHE_BACKEND.*$|CACHE_BACKEND = 'memcached://127.0.0.1:11211/'|" $DASHBOARD_LOCAL_SET +DASHBOARD_LOCAL_SET=/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py +if grep -q "^\s*CACHE_BACKEND" $DASHBOARD_LOCAL_SET ; then + sed -i "s|^\s*CACHE_BACKEND.*$|CACHE_BACKEND = 'memcached://127.0.0.1:11211/'|" $DASHBOARD_LOCAL_SET else - echo "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'" >> $DASHBOARD_LOCAL_SET + echo "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'" >> $DASHBOARD_LOCAL_SET fi -if [ "$DB" = "postgresql" ] -then +if [ "$DB" = "postgresql" ] ; then cat >> $DASHBOARD_LOCAL_SET <<EODASHDB DATABASES = { 'default': { @@ -134,9 +126,9 @@ fi if grep -q "^USE_SSL =" $DASHBOARD_LOCAL_SET; then - sed -i -e "s/^USE_SSL =.*/USE_SSL = True/" $DASHBOARD_LOCAL_SET + sed -i -e "s/^USE_SSL =.*/USE_SSL = True/" $DASHBOARD_LOCAL_SET else - echo "USE_SSL = True" >> $DASHBOARD_LOCAL_SET + echo "USE_SSL = True" >> $DASHBOARD_LOCAL_SET fi # Use 'secure' session and CSRF cookies (bnc#753582): cat >> $DASHBOARD_LOCAL_SET <<EOSEC @@ -148,87 +140,74 @@ sed -i -e "s;127.0.0.1;$IP;" /etc/nova/api-paste.ini /etc/glance/glance-api.conf /etc/glance/glance-registry.conf # configure nova -perl -i.bak -pe "s,sql_connection=\w+://\w+:[^\@:]*,sql_connection=$DB://nova:$mpw,; s/<IP>/$IP/g; s/(network_manager).*/\$1=nova.network.manager.FlatDHCPManager/;" /etc/nova/nova.conf -echo "flat_network_bridge=$br" >> /etc/nova/nova.conf -echo "bridge_interface=$br" >> /etc/nova/nova.conf -echo 'connection_type=libvirt' >> /etc/nova/nova.conf -echo 'image_service=nova.image.glance.GlanceImageService' >> /etc/nova/nova.conf -echo "glance_api_servers=$IP:9292" >> /etc/nova/nova.conf -echo "auth_strategy=keystone" >> /etc/nova/nova.conf -echo "novncproxy_base_url=http://$IP:6080/vnc_auto.html" >> /etc/nova/nova.conf -extensions_path=`ls -d /usr/lib*/python*/site-packages/extensions 2> /dev/null | head -n 1` +perl -i.bak -pe "s,sql_connection=\w+://\w+:[^\@:]*,sql_connection=$DB://nova:$mpw,; s/<IP>/$IP/g;" /etc/nova/nova.conf + +openstack-config --set /etc/nova/nova.conf DEFAULT flat_network_bridge "$br" +openstack-config --set /etc/nova/nova.conf DEFAULT bridge_interface "$br" +openstack-config --set /etc/nova/nova.conf DEFAULT glance_api_servers "$IP:9292" +openstack-config --set /etc/nova/nova.conf DEFAULT novncproxy_base_url "http://$IP:6080/vnc_auto.html" + +extensions_path=$(ls -d /usr/lib*/python*/site-packages/extensions 2> /dev/null | head -n 1) if [ -n "$extensions_path" ]; then - echo "osapi_extensions_path=" >> /etc/nova/nova.conf + openstack-config --set /etc/nova/nova.conf DEFAULT osapi_extensions_path "$extensions_path" fi # configure cinder -sed -i -e "s,#*[ ]*sql_connection=.*,sql_connection=$DB://cinder:${mpw}@${IP}/cinder," /etc/cinder/cinder.conf - -grep -q nova-rootwrap /etc/sudoers || echo "openstack-nova ALL=(ALL) NOPASSWD:/usr/bin/nova-rootwrap" >> /etc/sudoers -grep -q cinder-rootwrap /etc/sudoers || echo "openstack-cinder ALL=(ALL) NOPASSWD:/usr/bin/cinder-rootwrap" >> /etc/sudoers +openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection "$DB://cinder:${mpw}@${IP}/cinder" # configure tgt for cinder grep -q "include /var/lib/cinder/volumes" /etc/tgt/targets.conf || echo "include /var/lib/cinder/volumes/*" >> /etc/tgt/targets.conf rctgtd restart perl -i -pe "s/%SERVICE_TOKEN%/$SERVICE_TOKEN/;" /etc/nova/api-paste.ini # obsolete 2012-03-19? -for m in cinder nova glance ; do - sed -i -e 's/%SERVICE_TENANT_NAME%/service/' -e "s/%SERVICE_USER%/$m/" -e "s/%SERVICE_PASSWORD%/$SERVICE_TOKEN\nadmin_token = $SERVICE_TOKEN/" /etc/$m/*.ini /etc/$m/*.conf +for m in cinder nova glance quantum ; do + sed -i -e 's/%SERVICE_TENANT_NAME%/service/' -e "s/%SERVICE_USER%/$m/" -e "s/%SERVICE_PASSWORD%/$SERVICE_TOKEN\nadmin_token = $SERVICE_TOKEN/" /etc/$m/*.ini /etc/$m/*.conf done -# replace pipelines to use keystone -function replace_pipeline() { - sed "/\[pipeline:$1\]/,/\[/s/^pipeline = .*/pipeline = $2/" -i /etc/nova/api-paste.ini -} -replace_pipeline "ec2cloud" "ec2faultwrap logrequest totoken authtoken keystonecontext cloudrequest authorizer validator ec2executor" -replace_pipeline "ec2admin" "ec2faultwrap logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor" -replace_pipeline "openstack_compute_api_v2" "faultwrap authtoken keystonecontext ratelimit osapi_compute_app_v2" -replace_pipeline "openstack_volume_api_v1" "faultwrap authtoken keystonecontext ratelimit osapi_volume_app_v1" - if [ "$DB" = "postgresql" ] ; then - DATADIR=/var/lib/pgsql/data - if ! grep -q ::/0 $DATADIR/pg_hba.conf ; then + DATADIR=/var/lib/pgsql/data + if ! grep -q ::/0 $DATADIR/pg_hba.conf ; then sed -i "s/^$host .*$ ident$.*$/\1 md5 \2/" "$DATADIR/pg_hba.conf" sed -i "s/^$local $/local horizon all md5 sameuser\n\1/" "$DATADIR/pg_hba.conf" - # allow remote connections: - echo "listen_addresses = '*'" >> $DATADIR/postgresql.conf - echo "host all all 0.0.0.0/0 md5 sameuser" >> $DATADIR/pg_hba.conf - echo "host all all ::/0 md5 sameuser" >> $DATADIR/pg_hba.conf - if ! rpm -q postgresql | grep -q postgresql-8 ; then - sed -i 's/\s*sameuser$//' $DATADIR/pg_hba.conf # adapt config syntax to postgresql-9 - fi - fi - sudo -u postgres dropdb keystone # needed for keystone_data.sh - for DBNAME in nova cinder keystone glance horizon ; do - # use ALTER if CREATE fails: the role probably already exists - # in that case - sudo -u postgres psql -c "CREATE ROLE $DBNAME PASSWORD '$mpw' LOGIN;" || \ - sudo -u postgres psql -c "ALTER ROLE $DBNAME PASSWORD '$mpw' LOGIN;" - sudo -u postgres createdb -O $DBNAME $DBNAME - done - sudo -u postgres createuser -s root - /etc/init.d/postgresql restart - insserv postgresql + # allow remote connections: + echo "listen_addresses = '*'" >> $DATADIR/postgresql.conf + echo "host all all 0.0.0.0/0 md5 sameuser" >> $DATADIR/pg_hba.conf + echo "host all all ::/0 md5 sameuser" >> $DATADIR/pg_hba.conf + if ! rpm -q postgresql | grep -q postgresql-8 ; then + sed -i 's/\s*sameuser$//' $DATADIR/pg_hba.conf # adapt config syntax to postgresql-9 + fi + fi + sudo -u postgres dropdb keystone || true # needed for keystone_data.sh + for DBNAME in nova cinder keystone glance horizon ; do + # use ALTER if CREATE fails: the role probably already exists + # in that case + sudo -u postgres psql -c "CREATE ROLE $DBNAME PASSWORD '$mpw' LOGIN;" || \ + sudo -u postgres psql -c "ALTER ROLE $DBNAME PASSWORD '$mpw' LOGIN;" + sudo -u postgres createdb -O $DBNAME $DBNAME || true + done + sudo -u postgres createuser -s root + /etc/init.d/postgresql restart + insserv postgresql else - echo | mysql -u root || pwquery=-p - for DBNAME in nova cinder keystone glance horizon ; do - echo " - set global character_set_server=latin1; - set session character_set_server=latin1; - CREATE DATABASE IF NOT EXISTS $DBNAME; - GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBNAME'@localhost IDENTIFIED BY '$mpw'; - GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBNAME'@'%' IDENTIFIED BY '$mpw'; - " | mysql -u root $pwquery - done + echo | mysql -u root || pwquery=-p + for DBNAME in nova cinder keystone glance horizon ; do + echo " + set global character_set_server=latin1; + set session character_set_server=latin1; + CREATE DATABASE IF NOT EXISTS $DBNAME; + GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBNAME'@localhost IDENTIFIED BY '$mpw'; + GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBNAME'@'%' IDENTIFIED BY '$mpw'; + " | mysql -u root $pwquery + done fi # sync dashboard DB "after" the database is created -cd /var/lib/openstack-dashboard && su -s /bin/bash -c "umask 0027; python -m 'manage' syncdb --noinput" wwwrun +run_as wwwrun "cd /usr/share/openstack-dashboard; umask 0027; python -m 'manage' syncdb --noinput" -cinder-manage db sync -nova-manage db sync +run_as $CINDER_SYSTEM_USER "cinder-manage db sync" +run_as $NOVA_SYSTEM_USER "nova-manage db sync" # optional - makes life better with little RAM if [ "$DB" = "postgresql" ] ; then echo " @@ -245,95 +224,48 @@ " | mysql -u root $pwquery fi -#nova-manage network create 10.10.134.32/27 1 32 -nova-manage network create --fixed_range_v4=$testnet --label=testnet +#run_as $NOVA_SYSTEM_USER "nova-manage network create 10.10.134.32/27 1 32" +run_as $NOVA_SYSTEM_USER "nova-manage network create --fixed_range_v4=$testnet --label=testnet" # setup glance -for f in api registry ; do - grep paste_deploy /etc/glance/glance-$f.conf || echo -e "[paste_deploy]\nflavor = keystone" >> /etc/glance/glance-$f.conf -done sed -i "s%sql_connection =.*%sql_connection = $DB://glance:$mpw@$IP/glance%" /etc/glance/glance-registry.conf /etc/glance/glance-api.conf # db_sync is broken for postgresql #sed -i 's%sql_connection =.*%sql_connection = sqlite:////var/lib/glance/glance.sqlite%' /etc/glance/glance-registry.conf -glance-manage db_sync -chown -R $GLANCE_SYSTEM_USER:$GLANCE_SYSTEM_GROUP /var/lib/glance /var/log/glance +run_as $GLANCE_SYSTEM_USER "glance-manage db_sync" # keystone demo setup, based on devstack.sh sed -i -e 's/kvs/sql/' -e "s,^.*connection =.*,connection = $DB://keystone:$mpw@$IP/keystone," /etc/keystone/keystone.conf -#sed -i -e 's/kvs/sql/' -e 's,^connection =.*,connection =sqlite:////var/lib/keystone/keystone.sqlite,' /etc/keystone/keystone.conf rm -f /var/lib/keystone/keystone.sqlite # cleanup DB as devstack's script fails otherwise -sed -i -e "s/^.*admin_token .*/admin_token = $SERVICE_TOKEN/" /etc/keystone/keystone.conf -sed -i -e "s/.*$driver = keystone.catalog.backends.templated.TemplatedCatalog$/\1/" /etc/keystone/keystone.conf KEYSTONE_CATALOG=/etc/keystone/default_catalog.templates sed -e "s,%SERVICE_HOST%,$SERVICE_HOST,g" -e "s/%S3_SERVICE_PORT%/8080/" $KEYSTONE_CATALOG.sample > $KEYSTONE_CATALOG -# Upgrade the database to the latest schema -su - $KEYSTONE_SYSTEM_USER -s /bin/bash -c "keystone-manage --config-file=/etc/keystone/keystone.conf db_sync" -# -## Tenants -#keystone-manage tenant add admin -#keystone-manage tenant add demo -# -## Users -#keystone-manage user add admin $pw -#keystone-manage user add demo $pw -# -## Roles -#keystone-manage role add Admin -#keystone-manage role add Member -#keystone-manage role add KeystoneAdmin -#keystone-manage role add KeystoneServiceAdmin -#keystone-manage role grant Admin admin admin -#keystone-manage role grant Member demo demo -#keystone-manage role grant Admin admin demo -#keystone-manage role grant Admin admin -#keystone-manage role grant KeystoneAdmin admin -#keystone-manage role grant KeystoneServiceAdmin admin -# -## Services -#keystone-manage service add nova compute "Nova Compute Service" -#keystone-manage service add glance image "Glance Image Service" -#keystone-manage service add keystone identity "Keystone Identity Service" -# -##endpointTemplates -#keystone-manage endpointTemplates add RegionOne nova http://$IP:8774/v1.1/%tenant_id% http://$IP:8774/v1.1/%tenant_id% http://$IP:8774/v1.1/%tenant_id% 1 1 -#keystone-manage endpointTemplates add RegionOne glance http://$IP:9292/v1.1/%tenant_id% http://$IP:9292/v1.1/%tenant_id% http://$IP:9292/v1.1/%tenant_id% 1 1 -#keystone-manage endpointTemplates add RegionOne keystone http://$IP:5000/v2.0 http://$IP:35357/v2.0 http://$IP:5000/v2.0 1 1 -# -## Tokens -#keystone-manage token add $SERVICE_TOKEN admin admin 2023-02-23T00:42 -# -## EC2 related creds - note we are setting the secret key to ADMIN_PASSWORD -## but keystone doesn't parse them - it is just a blob from keystone's -## point of view -#keystone-manage credentials add admin EC2 'admin' $pw admin || echo "no support for adding credentials" -#keystone-manage credentials add demo EC2 'demo' $pw demo || echo "no support for adding credentials" +openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token "$SERVICE_TOKEN" +# Upgrade the database to the latest schema +run_as $KEYSTONE_SYSTEM_USER "keystone-manage --config-file=/etc/keystone/keystone.conf db_sync" -# 2012-02-28 keystone light setup /etc/init.d/openstack-keystone restart -ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-vol,c-api,n-sch,n-novnc,n-xvnc,horizon,swift,mysql,rabbit} +ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-vol,c-api,n-sch,n-novnc,n-xvnc,q-svc,heat,horizon,swift,mysql,rabbit} KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST} KEYSTONE_AUTH_PORT=${KEYSTONE_AUTH_PORT:-35357} KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-http} SERVICE_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0 ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=service SERVICE_PASSWORD=$SERVICE_TOKEN SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT DEVSTACK_DIR=/root ENABLED_SERVICES=$ENABLED_SERVICES bash /usr/lib/devstack/keystone_data.sh -chown $KEYSTONE_SYSTEM_USER:$KEYSTONE_SYSTEM_GROUP -R /var/lib/keystone/ - - rm -f /usr/lib/python*/site-packages/nova-iptables.lock.lock # workaround bug rm -f /var/lock/SuSEfirewall2.booting # workaround openSUSE bug -SuSEfirewall2 stop # interferes with openstack's network/firewall -insserv -r SuSEfirewall2_setup -insserv -r SuSEfirewall2_init +if test -e /sbin/SuSEfirewall2; then + SuSEfirewall2 stop # interferes with openstack's network/firewall + insserv -r SuSEfirewall2_setup + insserv -r SuSEfirewall2_init +fi if which aa-complain >&/dev/null; then aa-complain /etc/apparmor.d/usr.sbin.libvirtd fi if [ -e /etc/init.d/boot.apparmor ]; then - /etc/init.d/boot.apparmor stop # interferes with openstack-nova-network + /etc/init.d/boot.apparmor stop # interferes with openstack-nova-network insserv -r boot.apparmor fi @@ -344,27 +276,27 @@ sed -i -e 's;.*user.*=.*;user = "qemu";' /etc/libvirt/qemu.conf # start services -for s in ntp libvirtd $DB rabbitmq-server iscsitarget open-iscsi tgtd memcached apache2 openstack-nova-api openstack-nova-scheduler openstack-nova-network openstack-nova-compute openstack-nova-vncproxy openstack-glance-api openstack-glance-registry openstack-keystone openstack-nova-consoleauth openstack-novncproxy +for s in ntp libvirtd $DB rabbitmq-server iscsitarget open-iscsi tgtd memcached apache2 openstack-nova-api openstack-nova-conductor openstack-nova-scheduler openstack-nova-network openstack-nova-compute openstack-nova-vncproxy openstack-glance-api openstack-glance-registry openstack-keystone openstack-nova-consoleauth openstack-novncproxy openstack-quantum do - i=/etc/init.d/$s - if [ -x $i ] ; then - insserv $s - $i restart - fi + i=/etc/init.d/$s + if [ -x $i ] ; then + insserv $s + $i restart + fi done /usr/sbin/openstack-loopback-lvm if [ "$?" -ne "0" ]; then - # setup failed, so do not use - for s in api scheduler volume ; do - insserv -r openstack-cinder-$s - done + # setup failed, so do not use + for s in api scheduler volume ; do + insserv -r openstack-cinder-$s + done else - grep -q openstack-loopback-lvm /etc/init.d/boot.local || echo /usr/sbin/openstack-loopback-lvm >> /etc/init.d/boot.local - for s in api scheduler volume ; do - /etc/init.d/openstack-cinder-$s restart - insserv openstack-cinder-$s - done + grep -q openstack-loopback-lvm /etc/init.d/boot.local || echo /usr/sbin/openstack-loopback-lvm >> /etc/init.d/boot.local + for s in api scheduler volume ; do + /etc/init.d/openstack-cinder-$s restart + insserv openstack-cinder-$s + done fi grep -q bash.openstackrc /etc/bash.bashrc.local ||\ @@ -374,10 +306,10 @@ . /etc/bash.bashrc.local for user in demo admin ; do - setcreds $user $pw - nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 # to allow ping - #nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 # to allow only SSH or do - nova secgroup-add-rule default tcp 1 65535 0.0.0.0/0 # to allow all TCP - nova secgroup-add-rule default udp 1 65535 0.0.0.0/0 # and all UDP - nova secgroup-list-rules default # lists the rules + setcreds $user $pw + nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 # to allow ping + #nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 # to allow only SSH or do + nova secgroup-add-rule default tcp 1 65535 0.0.0.0/0 # to allow all TCP + nova secgroup-add-rule default udp 1 65535 0.0.0.0/0 # and all UDP + nova secgroup-list-rules default # lists the rules done -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-nova for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2013-04-29 14:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-nova", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes 2013-01-29 06:46:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes 2013-04-29 14:09:49.000000000 +0200 @@ -2 +2 @@ -Fri Jan 18 13:42:51 UTC 2013 - vuntz(a)suse.com +Mon Mar 18 09:39:21 UTC 2013 - speilicke(a)suse.com @@ -4,6 +4 @@ -- Update to version 2012.2.3+git.1358515929.3545a7d: - + Add NFS to the libvirt volume driver list - + Call plug_vifs() for all instances in init_host - + Fix addition of CPU features when running against legacy libvirt - + Fix typo in resource tracker audit message -- Move back to "git_tarballs" source service. +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix @@ -11,16 +6,2 @@ --------------------------------------------------------------------- -Thu Jan 17 15:22:36 UTC 2013 - cloud-devel(a)suse.de - -- Start using obs-service-github_tarballs - --------------------------------------------------------------------- -Thu Jan 17 14:52:08 UTC 2013 - cloud-devel(a)suse.de - -- Update to version 2012.2.3+git.1358434328.a41b913: - + Provide better error message for aggregate-create - + Fix errors in used_limits extension - + Add an iptables mangle rule per-bridge for DHCP. - + Limit formatting routes when adding resources - --------------------------------------------------------------------- -Thu Jan 3 12:17:48 UTC 2013 - cloud-devel(a)suse.de +------------------------------------------------------------------- +Fri Feb 22 10:26:40 UTC 2013 - saschpe(a)suse.de @@ -28,2 +9 @@ -- Update to version 2012.2.3+git.1357215468.451003e: - + Fix a crash when launching qcow2 images containing snapshots +- BuildRequire openstack-suse-macros instead of openstack-macros @@ -37 +17 @@ -Tue Dec 11 17:36:43 UTC 2012 - cloud-devel(a)suse.de +Tue Dec 11 17:36:43 UTC 2012 - saschpe(a)suse.de --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2013-04-17 23:13:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2013-04-29 14:09:49.000000000 +0200 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Thu Apr 4 16:34:42 UTC 2013 - dmueller(a)suse.com + +- update to grizzly-stable + +------------------------------------------------------------------- +Tue Apr 2 08:38:44 UTC 2013 - speilicke(a)suse.com + +- Update to version 2013.1.rc2 + +------------------------------------------------------------------- +Tue Mar 26 12:37:25 UTC 2013 - dmueller(a)suse.com + +- downgrade to 2013.1.rc1 + @@ -2 +17 @@ -Sun Mar 24 00:11:28 UTC 2013 - cloud-devel(a)suse.de +Tue Mar 26 10:50:54 CET 2013 - berendt(a)b1-systems.de @@ -4,5 +19 @@ -- Update to version 2012.2.4+git.1364083888.5b43cef: - + libvirt: enable apic setting for Xen or KVM guest. - + Fix double reboot issue during soft reboot - + Enable VM DHCP request to reach DHCP agent - + Handle compute node records with no timestamp. +- fixed openstack-nova-vncproxy.init @@ -11 +22 @@ -Thu Mar 14 21:53:59 UTC 2013 - vuntz(a)suse.com +Sun Mar 24 00:44:59 UTC 2013 - cloud-devel(a)suse.de @@ -13,4 +24,59 @@ -- Update to version 2012.2.4+git.1363298039.9561484: - + Fix an error in affinity filters - + Add quotas for fixed ips. (CVE-2013-1838) -- This fixes bnc#808622. +- Update to version 2013.2.a35.g4fedcd7+git.1364085899.4fedcd7: + + Change type of ssh_port option from Str to Int + + nova-manage vm list fails looking 'instance_type' + + Add caching for ec2 mapping ids. + + Make nova.virt.fake.FakeDriver useable in integration testing + + Change arguments to volume_detach() + + Fixes passing arbitrary conductor_api argument + + translate cinder BadRequest exception + + Initialize compute manager before loading driver. + + py2.6 doesn't support TextTestRunner resultclass + + Add a comment to placeholder migrations. + + Make _downsize_quota_delta() use stashed instance types + + Remove outdated try except block in ec2 code + +------------------------------------------------------------------- +Wed Mar 20 09:10:00 UTC 2013 - speilicke(a)suse.com + +- python-discover is only a test-dependency on platforms with Python < 2.7 + (SLE_11_SP2 in other words) + +-------------------------------------------------------------------- +Tue Mar 19 12:04:24 CET 2013 - berendt(a)b1-systems.de + +- added missing requirement novnc for package + openstack-nova-novncproxy + +-------------------------------------------------------------------- +Mon Mar 18 18:59:11 CET 2013 - berendt(a)b1-systems.de + +- added missing init scripts for following services + + consoleauth + + spicehtml5proxy +- moved consoleauth into separate subpackage + +-------------------------------------------------------------------- +Mon Mar 18 17:16:45 CET 2013 - berendt(a)b1-systems.de + +- fixed sysconfig file of openstack-nova-novncproxy +- added missing requirements of openstack-nova-novncproxy + +-------------------------------------------------------------------- +Mon Mar 18 09:39:03 UTC 2013 - speilicke(a)suse.com + +- Update to version 2013.1.a5126.ged1d6f2: + + Make ssh key injection work with xenapi agent + + Update migration 153 for efficiency. + + rstrip() strips characters, not strings + + Store project_id for instance actions + + Fix use of libvirt_disk_prefix + + Revert "Remove the usage of instance['extra_specs' + + Add standard methods to the Limits API + + Imported Translations from Transifex + + Check keypair destroy result operation +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Mon Mar 18 08:43:51 CET 2013 - berendt(a)b1-systems.de + +- mark /etc/nova/api-paste.ini as noreplace @@ -19 +85,59 @@ -Mon Mar 11 13:05:55 UTC 2013 - cloud-devel(a)suse.de +Sun Mar 17 11:29:54 UTC 2013 - dmueller(a)suse.com + +- Update to version 2013.1.a5108.g9ee8c94+git.1363519794.9ee8c94: + + xenapi: Fix reboot with hung volumes + + Fix: Managers that incorrectly derive from SchedulerDependentManager + + Delete instance metadata when delete VM + + Pin SQLAlchemy to 0.7.x + + Fix nova-manage --version + + Switch to final 1.1.0 oslo.config release + + Sync rpc from oslo-incubator. + + Fix reconnecting to libvirt. + + Lazy load CONF.quota_driver. + + Skip deleted fixed ip address for os-fixed-ips extension + + Prepare services index method for use with cells + + Fix behaviour of split_cell_and_item + + Update to Quantum Client 2.2.0 + + Add missing tests for db.block_device_mapping_* methods + + List ComputeHostNotFound as a client exception + + Virtual Power Driver list running vms quoting error + + Make run_instance() bail quietly if instance has been deleted + + Fix use of potentially-stale instance_type in tenant_usage + + Refactor work with session in db.block_device_mapping_* methods + + Don't load system_metadata when it isn't joined. + + Fix: Nova aggregate API throws an uncaught exception on invalid host + + List ConsoleTypeInvalid as a client exception. + + Force nova to use keystone v2.0 for auth_token + + Remove sqlalchemy calling back to DB API + + Fix cells instance deletion + + Resize/Migrate refactoring fixes and test cases + + Generalize console error handling during build. + + Don't log traceback on expected console error. + + Fix copyright - from LLC to Foundation + + Read instance resource quota info from "quota" namespace. + + Makes safe xml data calls raise 400 http error instead of 500 + + Do not accept invalid keys in quota-update + + Fixes an iSCSI connector issue in the Hyper-V driver. + + Add the serial to connection info for boot volumes + + Don't include traceback when wrapping exceptions + + Fix system_metadata "None" and created_at values + + Do cleaning up resource before rescheduling. + + Add quotas for fixed ips. + + Fixes Hyper-V live migration with attached volumes + + Imported Translations from Transifex + + Fix exception message in Networks API extension + + Add missing API doc for networks-post-req. + + Fixes instance task_state being left as migrating + + Fix OS-DCF:diskconfig XML handling + + Drop gzip flag from tar command for OVF archives + + Fix: improve API error responses from os-hosts extension + + Make conductor's quota methods pass project_id properly + + Make os-services API extensions consistent. + + Fix db archiving bug with foreign key constraints. + + Revert 1154253 causes XenServer image compat issue + + Remove the usage of instance['extra_specs']. +- remove sqlalchemy-update.diff: + + merged upstream + +------------------------------------------------------------------- +Fri Mar 15 17:46:31 UTC 2013 - iartarisi(a)suse.com @@ -21,2 +145,114 @@ -- Update to version 2012.2.4+git.1363007155.c06b205: - + Avoid vm instance shutdown when power state is NOSTATE +- change ownership of /var/cache/nova dir to the openstack-nova user + +------------------------------------------------------------------- +Thu Mar 14 16:54:55 UTC 2013 - iartarisi(a)suse.com + +- fix cache directory and change it in the config file, too + +------------------------------------------------------------------- +Thu Mar 14 16:18:42 UTC 2013 - iartarisi(a)suse.com + +- add /var/cache/nova/api dir for authentication cache + +-------------------------------------------------------------------- +Thu Mar 14 09:19:00 CET 2013 - berendt(a)b1-systems.de + +- added missing dependency python-pyasn1 to python-nova + +-------------------------------------------------------------------- +Wed Mar 13 00:18:38 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a5007.g071719a+git.1363133918.071719a: + + Add numerous fixes to test_api_samples + + Pass migration_ref when when auto-confirming + + Handle vcpu counting failures gracefully + + Return XML message with objectserver 404. + + Rename LLC to Foundation + + Deprecate CONF.fixed_range, do dynamic setup + + Remove instance['instance_type'] relationship from db api + + Force resource updates to update updated_at + + Fixes nbd device can't be released error + + websockify 0.4 is busted + + Compile BigInteger to INTEGER for sqlite + + Fix quota issues with instance deletes. + + Fix: nova-manage throws uncaught exception on invalid host/service + +-------------------------------------------------------------------- +Tue Mar 12 00:02:43 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a4981.g2d7b7a1+git.1363046563.2d7b7a1: + + Rewrap two lines. + + Correct exception args in vfs/guestfs. ++++ 966 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes Old: ---- nova-stable-folsom.tar.gz nova.conf sysconfig.openstack-novncproxy New: ---- nova-conf-defaults.patch nova-stable-grizzly.tar.gz nova-sudoers sysconfig.openstack-nova-novncproxy ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -20,15 +20,15 @@ %define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2012.2.4+git.1364083888.5b43cef -Release: 1 -License: Apache-2.0 +Version: 2013.1.1.a1.g4216ba7 +Release: 0 Summary: OpenStack Compute (Nova) - Documentation -Url: http://openstack.org/projects/compute/ +License: Apache-2.0 Group: Documentation/HTML -Source: nova-stable-folsom.tar.gz +Url: http://openstack.org/projects/compute/ +Source: nova-stable-grizzly.tar.gz BuildRequires: graphviz -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-Cheetah BuildRequires: python-PasteDeploy BuildRequires: python-Sphinx @@ -47,8 +47,8 @@ BuildRequires: python-mox BuildRequires: python-netaddr #BuildRequires: python-nova -BuildRequires: python-openssl BuildRequires: python-paste +BuildRequires: python-pyOpenSSL #BuildRequires: python-qpid #BuildRequires: python-quantumclient BuildRequires: python-routes @@ -65,7 +65,7 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n nova-2012.2.4 +%setup -q -n nova-2013.1.1.a1.g4216ba7 %openstack_cleanup_prep %build ++++++ openstack-nova.spec ++++++ ++++ 616 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.spec ++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.spec ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz</param> - <param name="email">cloud-devel(a)suse.de</param> + <param name="url">http://tarballs.openstack.org/nova/nova-stable-grizzly.tar.gz</param> + <param name="email">opensuse-cloud(a)opensuse.org</param> + <param name="plain-version">True</param> </service> </services> ++++++ nova-conf-defaults.patch ++++++ --- etc/nova/nova.conf.sample.orig +++ etc/nova/nova.conf.sample @@ -65,7 +65,7 @@ # # ip address of this host (string value) -#my_ip=10.0.0.1 +my_ip=<IP> # Name of this node. This can be an opaque identifier. It is # not necessarily a hostname, FQDN, or IP address. However, @@ -108,11 +108,11 @@ #pybasedir=/usr/lib/python/site-packages # Directory where nova binaries are installed (string value) -#bindir=$pybasedir/bin +bindir=/usr/bin # Top-level directory for maintaining nova's state (string # value) -#state_path=$pybasedir +state_path=/var/lib/nova # @@ -330,7 +330,7 @@ # The strategy to use for auth: noauth or keystone. (string # value) -#auth_strategy=noauth +auth_strategy=keystone # Treat X-Forwarded-For as the canonical remote address. Only # enable this if you have a sanitizing proxy. (boolean value) @@ -857,7 +857,7 @@ # hostname or ip for openstack to use when accessing the s3 # api (string value) -#s3_host=$my_ip +s3_host=$my_ip # port used when accessing the s3 api (integer value) #s3_port=3333 @@ -890,7 +890,7 @@ # The full class name of the network API class to use (string # value) -#network_api_class=nova.network.api.API +network_api_class=nova.network.quantumv2.api.API # @@ -1081,10 +1081,10 @@ #vpn_start=1000 # Number of addresses in each private subnet (integer value) -#network_size=256 +network_size=5000 # Fixed IP address block (string value) -#fixed_range=10.0.0.0/8 +fixed_range=192.168.0.0/24 # Fixed IPv6 address block (string value) #fixed_range_v6=fd00::/48 @@ -1148,7 +1148,7 @@ # # URL for connecting to quantum (string value) -#quantum_url=http://127.0.0.1:9696 +quantum_url=http://<IP>:9696 # timeout value for connecting to quantum in seconds (integer # value) @@ -1156,15 +1156,15 @@ # username for connecting to quantum in admin context (string # value) -#quantum_admin_username=<None> +quantum_admin_username=quantum # password for connecting to quantum in admin context (string # value) -#quantum_admin_password=<None> +quantum_admin_password=%SERVICE_PASSWORD% # tenant name for connecting to quantum in admin context # (string value) -#quantum_admin_tenant_name=<None> +quantum_admin_tenant_name=service # region name for connecting to quantum in admin context # (string value) @@ -1179,7 +1179,7 @@ # auth strategy for connecting to quantum in admin context # (string value) -#quantum_auth_strategy=keystone +quantum_auth_strategy=keystone # Name of Integration Bridge used by Open vSwitch (string # value) @@ -1292,7 +1292,7 @@ # The SQLAlchemy connection string used to connect to the # database (string value) -#sql_connection=sqlite:////nova/openstack/common/db/$sqlite_db +sql_connection=mysql://root:<mysql-password>@<IP>/nova # the filename to use with sqlite (string value) #sqlite_db=nova.sqlite @@ -1350,7 +1350,7 @@ # Directory to use for lock files. Default to a temp directory # (string value) -#lock_path=<None> +lock_path=/var/run/nova # @@ -1363,7 +1363,7 @@ # Print more verbose output (set logging level to INFO instead # of default WARNING level). (boolean value) -#verbose=false +verbose=true # Log output to standard error (boolean value) #use_stderr=true @@ -1427,7 +1427,7 @@ # (Optional) The directory to keep log files in (will be # prepended to --log-file) (string value) -#log_dir=<None> +log_dir=/var/log/nova # Use syslog for logging. (boolean value) #use_syslog=false @@ -1524,7 +1524,7 @@ # The RabbitMQ broker address where a single node is used # (string value) -#rabbit_host=localhost +rabbit_host=$my_ip # The RabbitMQ broker port where a single node is used # (integer value) @@ -1862,7 +1862,7 @@ # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, # fake.FakeDriver, baremetal.BareMetalDriver, # vmwareapi.VMWareESXDriver (string value) -#compute_driver=<None> +compute_driver=libvirt.LibvirtDriver # The default format an ephemeral_volume will be formatted # with on creation. (string value) @@ -2000,7 +2000,7 @@ #snapshot_image_format=<None> # The libvirt VIF driver to configure the VIFs. (string value) -#libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver +libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtBridgeDriver # Libvirt handlers for remote volumes. (list value) #libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver ++++++ nova-network-filter-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,8 +1,8 @@ -Index: nova-2012.1+git.1345844892.4d2a4af/nova/network/linux_net.py +Index: nova-2013.1.a4665.g42d058b/nova/network/linux_net.py =================================================================== ---- nova-2012.1+git.1345844892.4d2a4af.orig/nova/network/linux_net.py -+++ nova-2012.1+git.1345844892.4d2a4af/nova/network/linux_net.py -@@ -262,6 +262,9 @@ class IptablesManager(object): +--- nova-2013.1.a4665.g42d058b.orig/nova/network/linux_net.py ++++ nova-2013.1.a4665.g42d058b/nova/network/linux_net.py +@@ -323,6 +323,9 @@ class IptablesManager(object): # among the various nova components. It sits at the very top # of FORWARD and OUTPUT. for tables in [self.ipv4, self.ipv6]: @@ -12,11 +12,11 @@ tables['filter'].add_chain('nova-filter-top', wrap=False) tables['filter'].add_rule('FORWARD', '-j nova-filter-top', wrap=False, top=True) -Index: nova-2012.1+git.1345844892.4d2a4af/nova/tests/test_iptables_network.py +Index: nova-2013.1.a4665.g42d058b/nova/tests/test_iptables_network.py =================================================================== ---- nova-2012.1+git.1345844892.4d2a4af.orig/nova/tests/test_iptables_network.py -+++ nova-2012.1+git.1345844892.4d2a4af/nova/tests/test_iptables_network.py -@@ -144,7 +144,15 @@ class IptablesManagerTestCase(test.TestC +--- nova-2013.1.a4665.g42d058b.orig/nova/tests/test_iptables_network.py ++++ nova-2013.1.a4665.g42d058b/nova/tests/test_iptables_network.py +@@ -157,7 +157,15 @@ class IptablesManagerTestCase(test.TestC "Duplicate line: %s" % line) seen_lines.add(line) ++++++ nova-sudoers ++++++ openstack-nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * ++++++ openstack-nova-network-init-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,8 +1,8 @@ ---- openstack-nova-network.orig 2012-08-17 15:38:54.000000000 +0000 -+++ openstack-nova-network 2012-08-28 18:06:45.000000000 +0000 -@@ -45,9 +45,31 @@ - FULLNAME="OpenStack::Nova $name server" - CHUSER="-u $USER" +--- openstack-nova-network.orig 2013-02-18 16:05:13.000000000 +0100 ++++ openstack-nova-network 2013-02-18 16:25:37.000000000 +0100 +@@ -22,9 +22,31 @@ + + . /etc/rc.status +iptables_setup() +{ @@ -27,14 +27,14 @@ + case "$1" in start) - echo -n "Starting $FULLNAME" + echo -n "Starting nova-$DAEMON" + iptables_setup I - startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/nova-$name $OPTIONS + /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; -@@ -55,6 +77,7 @@ - echo -n "Shutting down $FULLNAME" - killproc /usr/bin/nova-$name +@@ -32,6 +52,7 @@ + echo -n "Shutting down nova-$DAEMON" + /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v + iptables_setup D ;; ++++++ openstack-nova-novncproxy.init ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -7,25 +7,17 @@ # Should-Start: rabbitmq-server mysql # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Nova novncproxy server -# Description: Nova novncproxy server. +# Short-Description: OpenStack Compute (Nova) - novncproxy +# Description: OpenStack Compute (Nova) - novncproxy ### END INIT INFO -name="novncproxy" +DAEMON="novncproxy" USER="openstack-nova" -GROUP="nobody" -CONFIGFILE="/etc/nova/nova.conf" -RUNDIR="/var/run/nova" -LOGFILE="/var/log/nova/$name.log" -WEBROOT="/var/lib/nova/noVNC" -DAEMON="nova-novncproxy" +CONFFILE="/etc/nova/nova.conf" +LOGFILE="/var/log/nova/$DAEMON.log" +WEBROOT="/usr/share/novnc/" -[ -e "/etc/sysconfig/openstack-$name" ] && . "/etc/sysconfig/openstack-$name" - -mkdir -p $RUNDIR - -DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE --web=$WEBROOT --daemon" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" +OPTIONS="--config-file=$CONFFILE --logfile=$LOGFILE --web=$WEBROOT --nodaemon" if [ "x$NOVNC_SSL_ENABLE" = "xyes" ] ; then SSL_KEY_FILE=`umask 077 >/dev/null ; mktemp /dev/shm/openstack-novnc-key.XXXXXX` SSL_CRT_FILE=`umask 077 >/dev/null ; mktemp /dev/shm/openstack-novnc-crt.XXXXXX` @@ -33,32 +25,18 @@ OPTIONS="--cert $SSL_CRT_FILE --key $SSL_KEY_FILE ${OPTIONS}" fi -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack::Nova $name server" - case "$1" in start) echo -n "Starting $DAEMON" [ ! -z "$SSL_CRT_FILE" ] && [ ! -z "$SSL_KEY_FILE" ] && ( umask 077 ; cp "$NOVNC_SSL_KEY" "$SSL_KEY_FILE" ; cp "$NOVNC_SSL_CERT" "$SSL_CRT_FILE" ) - startproc -u $USER /usr/bin/$DAEMON $OPTIONS </dev/null >/dev/null 2>&1 & + startproc -u $USER /usr/bin/nova-$DAEMON $OPTIONS rc_status -v ;; stop) echo -n "Shutting down $DAEMON" - killproc python /usr/bin/$DAEMON 2>/dev/null + killproc /usr/bin/nova-$DAEMON rc_status -v ;; restart) @@ -70,7 +48,7 @@ ;; status) echo -n "Checking $DAEMON" - /sbin/checkproc python /usr/bin/$DAEMON + /sbin/checkproc /usr/bin/nova-$DAEMON rc_status -v ;; condrestart|try-restart) @@ -86,3 +64,4 @@ exit 2 esac exit $? + ++++++ openstack-nova.init ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -2,86 +2,71 @@ ### BEGIN INIT INFO # Provides: openstack-nova-__NAME__ -# Required-Start: $network $remote_fs $syslog +# Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog -# Should-Start: rabbitmq-server mysql postgresql -# Should-Stop: rabbitmq-server mysql postgresql +# Should-Start: mysql postgresql rabbitmq-server +# Should-Stop: mysql postgresql rabbitmq-server # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Nova __NAME__ server -# Description: Nova __NAME__ server. +# Short-Description: OpenStack Compute (Nova) - __NAME__ +# Description: OpenStack Compute (Nova) - __NAME__ ### END INIT INFO -name="__NAME__" +DAEMON="__NAME__" USER="openstack-nova" -GROUP="nobody" -CONFIGFILE="/etc/nova/nova.conf" +CONFFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" -LOGFILE="/var/log/nova/$name.log" -[ -e "/etc/sysconfig/openstack-nova-$name" ] && . "/etc/sysconfig/openstack-nova-$name" +# $RUNDIR can be tmpfs, thus we have to create/own it here: +mkdir -p $RUNDIR && chown $USER. $RUNDIR -[ -e $LOGFILE ] || touch $LOGFILE -mkdir -p $RUNDIR -chown $USER. $RUNDIR $LOGFILE - -DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack::Nova $name server" -CHUSER="-u $USER" - case "$1" in start) - echo -n "Starting $FULLNAME" - startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/nova-$name $OPTIONS + echo -n "Starting nova-$DAEMON" + /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; stop) - echo -n "Shutting down $FULLNAME" - killproc /usr/bin/nova-$name + echo -n "Shutting down nova-$DAEMON" + /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v ;; restart) $0 stop - $0 start - rc_status + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status ;; reload) + echo -n "Reload service nova-$DAEMON" + rc_failed 3 + rc_status -v ;; status) - echo -n "Checking $FULLNAME" - /sbin/checkproc /usr/bin/nova-$name - rc_status -v - ;; - condrestart|try-restart) - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; + echo -n "Checking for service nova-$DAEMON" + /sbin/checkproc /usr/bin/nova-$DAEMON + rc_status -v + ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + rc_status # Remember status and be quiet + ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac -exit $? +rc_exit ++++++ openstack-nova.logrotate ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,5 +1,12 @@ +compress + /var/log/nova/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifempty su openstack-nova openstack-nova + sharedscripts } ++++++ sysconfig.openstack-nova-novncproxy ++++++ ## Path: System/Management ## Description: OpenStack noVNC Proxy ## Type: yesno ## Default: "no" # # Enable SSL for noVNC Proxy. # NOVNC_SSL_ENABLE="no" ## Type: string ## Default: "" # # Path to certificate for noVNC Proxy in SSL mode. # NOVNC_SSL_CERT="" ## Type: string ## Default: "" # # Path to the key for noVNC Proxy in SSL mode. # NOVNC_SSL_KEY="" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-keystone for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-keystone for openSUSE:Factory checked in at 2013-04-29 14:09:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-keystone (Old) and /work/SRC/openSUSE:Factory/.openstack-keystone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-keystone", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone-doc.changes 2013-01-17 15:14:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone-doc.changes 2013-04-29 14:09:43.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Mar 18 10:41:35 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +------------------------------------------------------------------- +Fri Feb 22 10:25:35 UTC 2013 - saschpe(a)suse.de + +- Require openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes 2013-04-17 23:13:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes 2013-04-29 14:09:43.000000000 +0200 @@ -0,0 +1,82 @@ +------------------------------------------------------------------- +Thu Apr 4 16:27:44 UTC 2013 - dmueller(a)suse.com + +- update to grizzly branch + +------------------------------------------------------------------- +Tue Apr 2 08:48:35 UTC 2013 - speilicke(a)suse.com + +- Update to version 2013.1.rc3 + +------------------------------------------------------------------- +Thu Mar 28 10:49:54 UTC 2013 - dmueller(a)suse.com + +- update to 2013.1.rc2 + +------------------------------------------------------------------- +Tue Mar 26 12:44:27 UTC 2013 - dmueller(a)suse.com + +- downgrade to 2013.1 + +-------------------------------------------------------------------- +Mon Mar 25 13:52:34 UTC 2013 - opensuse-cloud(a)opensuse.org + +- Update to version 2013.2.a338.gbceee56: + + Fix XML handling of member links (bug 1156594) + + Test default_project_id scoping (bug 1023502) + + Ensure delete domain removes all owned entities + + Utilize legacy_endpoint_id column (bug 1154918) + + Pass project membership as dict in migration 015. + + V2, V3 token intermix for unscoped tokens (bug 1156913) + + Revise docs to use keystoneclient.middleware.auth_token + + Fix live ldap tests + + Support for LDAP groups (bug #1092187) + + Correct spacing in warning msg + + Validate domains unconditionally (bug 1130236) + + Prohibit V3 V2 token intermix for resource in non-default domain (bug 1157430) + + Properly handle emulated ldap enablement + + Wrap config module and require manual setup (bug 1143998) + + Enable emulation for domains + + Allow trusts to be optional + + Version bump to 2013.2 + + Add a dereference option for ldap + + Move trusts to extension + + Make versions aware of enabled pipelines. + + Imported Translations from Transifex + + Rework S3Token middleware tests. + + Rename trust extension. + +------------------------------------------------------------------- +Mon Mar 18 10:41:29 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Sun Mar 17 11:28:35 UTC 2013 - dmueller(a)suse.com + +- Update to version 2013.1.a301.g16b4643+git.1363519715.16b4643: + + Explain LDAP page_size & default value + + Catch and log server exceptions + + Filter out legacy_endpoint_id (bug 1152635) + + Ensure tokens are revoked for relevant v3 api calls + + Switch to final 1.1.0 oslo.config release + + Added test cases to improve LDAP project testing + + Migrate roles from metadata to user_project_metadata + + duplicated trust tests + + quiet route logging on skipped tests + + Remove TODO that didn't land in grizzly + + No parent exception to wrap + + Remove duplicate password/token opts. + + Fixes bug 1151747: broken XML translation for resource collections + + xml_body returns backtrace on XMLSyntaxError + + extracting user and trust ids into normalized fields + + Discard null endpoints (bug 1152632) +- remove keystone-cs24277.diff: + * merged upstream + +------------------------------------------------------------------- +Wed Mar 13 10:17:48 UTC 2013 - dmueller(a)suse.com + +- add keystone-cs24277.diff: + * make keystone start again + @@ -2 +84 @@ -Wed Mar 20 16:27:29 UTC 2013 - vuntz(a)suse.com +Wed Mar 13 00:17:24 UTC 2013 - cloud-devel(a)suse.de @@ -4,2 +86,57 @@ -- Update to version 2012.2.4+git.1363796849.255b1d4: - + validate from backend (lp#1129713, bnc#809590, CVE-2013-1865) +- Update to version 2013.1.a271.g45228ca+git.1363133844.45228ca: + + cleanup trusts in controllers + + remove spurious roles check + + add belongs_to check + + Improve tests for api protection and filtering + +------------------------------------------------------------------- +Tue Mar 12 10:44:59 UTC 2013 - dmueller(a)suse.com + +- require python-oslo.config + +-------------------------------------------------------------------- +Tue Mar 12 00:10:56 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a263.g09e2fc7+git.1363047056.09e2fc7: + + Make getting user-domain roles backend independant + + Make Keystone return v3 as part of the version api + + bug 1133526 + + Run keystone server in debug mode. + + Fix folsom -> grizzly role table migration issues (bug 1119789) + + Revert "from tests import" + + Revert "update tests/__init__.py to verify openssl version" + +-------------------------------------------------------------------- +Mon Mar 11 09:59:43 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a251.g59757f6+git.1362995983.59757f6: + + Unpin pam dependency version + + Sync timeutils with oslo + + Remove obsolete *page[_marker] methods from LDAP backend. + + bug 1134802: fix inconsistent format for expires_at and issued_at + + Trusts + + Expand v3 trust test coverage + + keystone : Use Ec2Signer utility class from keystoneclient + + remove unused import + + Move auth plugins to 'keystone.auth.plugins' (bug 1136967) + + ports should be ints in config (bug 1137696) + + mark 2.0 API as stable + + Straighten out NotFound raising in LDAP backend. + + fix typo in kvs backend + + Move get_by_name to LdapBase. + + Remove unused methods from LDAP backed. + + return 201 Created on POST request (bug1131119) + + Delete tokens for user + + unable to load certificate should abort request + + add missing attributes for group/project tables (bug1126021) + + v3 endpoints won't have legacy ID's (bug 1150930) + + Change exception raised to Forbidden on trust_id + + from tests import + +------------------------------------------------------------------- +Fri Mar 8 11:01:34 UTC 2013 - vuntz(a)suse.com + +- Fix ownership of /var/log/keystone/keystone.log after call to + "keystone-manage pki_setup" in %post: if the package is installed + for the first time, the log file is owned by root, which breaks + keystone (since it can't write to the log file). @@ -13 +150,22 @@ -Tue Mar 5 16:51:28 UTC 2013 - cloud-devel(a)suse.de +Tue Mar 5 17:22:34 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a210.g2515d1b+git.1362504154.2515d1b: + + Ensure keystone unittests do not leave CONF.policyfile in bad state + + Move handle_conflicts decorator into sql + + flatten payload for policy + + Convert api to controller + + bug 1131840: fix auth and token data for XML translation + + domain_id_attributes in config.py have wrong default value + + command line switch for short pep8 output. + + Setup logging in keystone-manage command. + + Imported Translations from Transifex + + Enable a parameters on ldap to allow paged_search of ldap queries This fixes bug 1083463 + + update tests/__init__.py to verify openssl version + +------------------------------------------------------------------- +Mon Mar 4 13:38:13 UTC 2013 - iartarisi(a)suse.com + +- Move python-ldap requirement to python-keystone subpackage + +------------------------------------------------------------------- +Thu Feb 28 14:07:54 UTC 2013 - dmueller(a)suse.com @@ -15,3 +173,11 @@ -- Update to version 2012.2.4+git.1362502288.8690166: - + Sync timeutils to pick up normalize fix. - + Backport of fix for 24-hour failure of pki. +- Fix last change + +------------------------------------------------------------------- +Mon Feb 25 13:27:40 UTC 2013 - saschpe(a)suse.de + +- Ghost /var/run/keystone + +------------------------------------------------------------------- +Mon Feb 25 10:07:11 UTC 2013 - saschpe(a)suse.de + +- Drop sysconfig from init scripts @@ -20 +186 @@ -Fri Feb 22 10:11:13 UTC 2013 - cloud-devel(a)suse.de +Sun Feb 24 18:52:11 UTC 2013 - dmueller(a)suse.com @@ -22,3 +188,60 @@ -- Update to version 2012.2.4+git.1361527873.37b3532: - + Disable XML entity parsing (CVE-2013-1664, CVE-2013-1665) - + Ensure user and tenant enabled in EC2 (CVE-2013-0282) +- Update to version 2013.1.a191.g30dbb74+git.1361731931.30dbb74: + + Remove test_auth_token_middleware + + Silence routes internal debug logging + + Workaround Migration issue with PostgreSQL + + Add pysqlite as explicit test dep + + project membership to role conversion ++++ 373 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-keystone/openstack-keystone.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-keystone.new/openstack-keystone.changes Old: ---- FIX-BUILD.patch keystone-certs-test.patch keystone-hybrid-backend-folsom.tar.gz keystone-hybrid-conf-scope.patch keystone-sql-backend-from_dict.patch keystone-stable-folsom.tar.gz keystone-webob-empty-resp-environ.patch openstack-keystone.conf.sample openstack-keystone.wsgi New: ---- keystone-cs24277.diff keystone-hybrid-backend-master.tar.gz keystone-stable-grizzly.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-keystone-doc.spec ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openstack-keystone-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,14 @@ %define component keystone Name: openstack-%{component}-doc -Version: 2012.2.4+git.1363796849.255b1d4 +Version: 2013.1.1.a1.gec9115b Release: 0 -License: Apache-2.0 Summary: OpenStack Identity Service (Keystone) - Documentation -Url: https://github.com/openstack/keystone +License: Apache-2.0 Group: Documentation/HTML -Source: keystone-stable-folsom.tar.gz -BuildRequires: openstack-macros +Url: https://github.com/openstack/keystone +Source: keystone-stable-grizzly.tar.gz +BuildRequires: openstack-suse-macros BuildRequires: python-Sphinx BuildRequires: python-base BuildArch: noarch @@ -40,7 +40,7 @@ This package contains documentation files for openstack-keystone. %prep -%setup -q -n keystone-2012.2.4 +%setup -q -n keystone-2013.1.1.a1.gec9115b %openstack_cleanup_prep %build ++++++ openstack-keystone.spec ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -1,8 +1,7 @@ # # spec file for package openstack-keystone # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011 B1 Systems GmbH, Vohburg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,51 +19,41 @@ %define component keystone %define groupname openstack-%{component} %define username openstack-%{component} -%define hybrid keystone-hybrid-backend-folsom +%define hybrid keystone-hybrid-backend-master Name: openstack-%{component} -Version: 2012.2.4+git.1363796849.255b1d4 +Version: 2013.1.1.a1.gec9115b Release: 0 -License: Apache-2.0 Summary: OpenStack Identity Service (Keystone) -Url: https://github.com/openstack/keystone +License: Apache-2.0 Group: Development/Languages/Python -Source: keystone-stable-folsom.tar.gz +Url: https://github.com/openstack/keystone +Source: keystone-stable-grizzly.tar.gz Source1: %{name}.init Source2: logging.conf Source3: default_catalog.templates -# Apache2 SSL proxy example configuration: -Source4: openstack-keystone.conf.sample -# WSGI application skeleton for public and admin API apps (for the SSL proxy): -Source5: openstack-keystone.wsgi # Hybrid identity backend - uses the existing LDAP backend for users and # the SQL backend for tenants/roles Source6: %{hybrid}.tar.gz Source7: %{name}.logrotate -# Add a configuration option for reading the ldap user_scope (part of -# the hybrid backend) -Patch1: keystone-hybrid-conf-scope.patch -# Don't modify the passed in dict to the sql backend's from_dict method -# (fixes our testsuite) https://review.openstack.org/14472 -Patch2: keystone-sql-backend-from_dict.patch -# Fix a unittest bug with empty environ on our version of WebOb -# (will probably never land in folsom) https://review.openstack.org/#/c/17193/ -Patch3: keystone-webob-empty-resp-environ.patch -# Fix a unittest bug that reads ssl configuration from etc -# (will probably never land in folsom) https://review.openstack.org/#/c/17341/ -Patch4: keystone-certs-test.patch -#TODO/FIXME: check the issue! -Patch666: FIX-BUILD.patch -BuildRequires: apache2 -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros +BuildRequires: openstack-utils BuildRequires: python-base BuildRequires: python-distribute +BuildRequires: python-oslo.config +# Documentation build requirements: BuildRequires: python-Sphinx Requires: logrotate +Requires: python-argparse +Requires: python-iso8601 Requires: python-keystone = %{version} +Requires: python-oslo.config BuildRoot: %{_tmppath}/%{name}-%{version}-build # To generate a self-signed certificate to be used in demo setups: -Requires(post): apache2-utils +Requires(post): coreutils +Requires(post): python-keystone +Requires(post): python-argparse +Requires(post): python-iso8601 Requires(post): openssl Requires(post): sysconfig %if 0%{?suse_version} > 1110 @@ -72,9 +61,6 @@ %else Requires(pre): shadow-utils %endif -%if 0%{?fedora} -Requires(pre): shadow-utils -%endif %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -87,20 +73,23 @@ family. %package -n python-keystone + Summary: OpenStack Identity Service (Keystone) - Python module Group: Development/Languages/Python Requires: python >= 2.6.8 -Requires: python-PasteDeploy Requires: python-Paste +Requires: python-PasteDeploy +Requires: python-Routes Requires: python-SQLAlchemy >= 0.7.8 Requires: python-WebOb -Requires: python-eventlet +Requires: python-eventlet >= 0.9.12 Requires: python-greenlet Requires: python-iso8601 >= 0.1.4 +Requires: python-keystoneclient >= 0.2 +Requires: python-ldap Requires: python-lxml Requires: python-pam Requires: python-passlib -Requires: python-routes Requires: python-sqlalchemy-migrate >= 0.7.2 %description -n python-keystone @@ -111,15 +100,16 @@ This package contains the core Python module of OpenStack Keystone. %package test + Summary: Testsuite for the OpenStack Keystone Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python-Sphinx >= 1.1.2 +Requires: python-WebTest Requires: python-coverage -Requires: python-distribute >= 0.6.24 Requires: python-keystoneclient -Requires: python-ldap Requires: python-mox +Requires: python-netifaces Requires: python-nose Requires: python-nosehtmloutput Requires: python-nosexcover @@ -129,7 +119,6 @@ Requires: python-python-memcached Requires: python-swift Requires: python-unittest2 -Requires: python-WebTest %description test The OpenStack Keystone testsuite. It is used to verify the @@ -137,15 +126,8 @@ %prep # unpack the backend hybrid in addition to the main keyston source -%setup -q -T -D -b0 -a6 -n keystone-2012.2.4 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch666 -p1 +%setup -q -T -D -b0 -a6 -n keystone-2013.1.1.a1.gec9115b %openstack_cleanup_prep -# set the sqlite3 path to /var/lib/keystone -sed -i 's%^connection =.*%connection = sqlite:////var/lib/keystone/keystone.db%' etc/keystone.conf.sample %build python setup.py build @@ -155,14 +137,12 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} ### directories -install -d -m 755 %{buildroot}%{_localstatedir}/lib/keystone -install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone +install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log,run}/keystone ### configuration files install -d -m 0755 %{buildroot}%{_sysconfdir}/keystone cp %{SOURCE2} %{buildroot}%{_sysconfdir}/keystone/ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates.sample -sed -i -e 's,^template_file .*,template_file = /etc/keystone/default_catalog.templates,' etc/keystone.conf.sample cp etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf cp etc/policy.json %{buildroot}%{_sysconfdir}/keystone/ install -p -D -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -179,27 +159,44 @@ ### test subpackage %openstack_test_package_install -### apache/WSGI for SSL -%openstack_apache_ssl_cert_install -# Apache2 sample configuration -install -m 644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/apache2/conf.d/openstack-keystone.conf.sample -# Apache2 WSGI apps -install -D %{SOURCE5} %{buildroot}%{_localstatedir}/lib/keystone/wsgi/admin.wsgi -install -D %{SOURCE5} %{buildroot}%{_localstatedir}/lib/keystone/wsgi/main.wsgi +### create keystone ssl dirs +install -d %{buildroot}%{_sysconfdir}/keystone/ssl/private +touch %{buildroot}%{_sysconfdir}/keystone/ssl/private/signing_key.pem +install -d %{buildroot}%{_sysconfdir}/keystone/ssl/certs +touch %{buildroot}%{_sysconfdir}/keystone/ssl/certs/signing_cert.pem ### Keystone hybrid identity backend install -D -m 644 %{hybrid}/hybrid.py %{buildroot}%{python_sitelib}/keystone/identity/backends/ -install -m 644 %{hybrid}/hybrid_config.py %{buildroot}%{python_sitelib}/keystone/identity/backends/ install -D -m 644 %{hybrid}/test_backend_hybrid.py %{buildroot}%{_localstatedir}/lib/openstack-keystone-test/tests/ install -D -m 644 %{hybrid}/backend_hybrid.conf %{buildroot}%{_localstatedir}/lib/openstack-keystone-test/tests/ +### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) +%define keystone_conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf +openstack-config --set %{keystone_conf} DEFAULT verbose True +openstack-config --set %{keystone_conf} DEFAULT log_file keystone.log +openstack-config --set %{keystone_conf} DEFAULT log_dir /var/log/keystone +#TODO/FIXME(saschpe): Do we really want to use the file-based catalog or move into DB by default? +openstack-config --set %{keystone_conf} catalog template_file /etc/keystone/default_catalog.templates +openstack-config --set %{keystone_conf} catalog driver keystone.catalog.backends.templated.TemplatedCatalog +#TODO/FIXME(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? +openstack-config --set %{keystone_conf} sql connection sqlite:////var/lib/keystone/keystone.db + %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/keystone -s /sbin/nologin -c "OpenStack keystone Daemon" %{username} exit 0 %post -%openstack_apache_ssl_cert_post +# create an example.com certificate if not available already +if ! [ -r /etc/keystone/ssl/certs/signing_cert.pem ]; then + # recreate index.txt if it is only about the example.com config + if [ $(wc -l /etc/keystone/ssl/certs/index.txt) -le 1] && grep -q CN=www.example.com /etc/keystone/ssl/certs/index.txt; then + rm /etc/keystone/ssl/certs/index.txt + fi + /usr/bin/keystone-manage pki_setup --keystone-user %{username} --keystone-group %{groupname} + # keystone-manage will create a keystone.log file owned by root; fix that + test -f %{_localstatedir}/log/keystone/keystone.log && chown %{username}:%{groupname} %{_localstatedir}/log/keystone/keystone.log +fi %fillup_and_insserv %{name} %restart_on_update %{name} @@ -212,33 +209,34 @@ %files %defattr(-,root,root) -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/keystone -%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/keystone -%dir %attr(0750, root, %{groupname}) %{_sysconfdir}/keystone -%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/keystone/keystone.conf -%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/keystone/logging.conf -%config(noreplace) %{_sysconfdir}/keystone/policy.json +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} +%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/%{component} +%dir %attr(0750, root, %{groupname}) %{_sysconfdir}/%{component} +%dir %attr(0755, root, %{groupname}) %{_sysconfdir}/%{component}/ssl +%dir %attr(0755, root, %{groupname}) %{_sysconfdir}/%{component}/ssl/certs +%ghost %attr(0644, root, %{groupname}) %{_sysconfdir}/%{component}/ssl/certs/signing_cert.pem +%dir %attr(0750, root, %{groupname}) %{_sysconfdir}/%{component}/ssl/private +%ghost %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/ssl/private/signing_key.pem +%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/%{component}.conf +%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/logging.conf +%config %{_sysconfdir}/%{component}/policy.json %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%attr(0640, %{username}, %{groupname}) %{_sysconfdir}/keystone/default_catalog.templates.sample +%attr(0640, %{username}, %{groupname}) %{_sysconfdir}/%{component}/default_catalog.templates.sample %{_initddir}/%{name} %{_sbindir}/rc%{name} %{_bindir}/keystone-all %{_bindir}/keystone-manage %{_mandir}/man1/keystone* -%openstack_apache_ssl_cert_files -%{_sysconfdir}/apache2/conf.d/openstack-keystone.conf.sample -%dir %attr(0755, root, root) %{_localstatedir}/lib/keystone/wsgi -%attr(0644, root, root) %{_localstatedir}/lib/keystone/wsgi/*.wsgi %doc tools/sample_data.sh %files -n python-keystone %defattr(-,root,root,-) -%{python_sitelib} -#%config %{python_sitelib}/keystone/identity/backends/hybrid_config.py %doc LICENSE +%{python_sitelib} %files test %defattr(-,root,root) -%{_localstatedir}/lib/openstack-keystone-test +%{_localstatedir}/lib/openstack-%{component}-test %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -3,8 +3,8 @@ <param name="url">git://github.com/SUSE-Cloud/keystone-hybrid-backend.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="version">folsom</param> - <param name="revision">folsom</param> + <param name="version">master</param> + <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> @@ -13,7 +13,8 @@ </service> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/keystone/keystone-stable-folsom.tar.gz</param> - <param name="email">cloud-devel(a)suse.de</param> + <param name="url">http://tarballs.openstack.org/keystone/keystone-stable-grizzly.tar.gz</param> + <param name="email">opensuse-cloud(a)opensuse.org</param> + <param name="plain-version">True</param> </service> </services> ++++++ default_catalog.templates ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -17,6 +17,10 @@ catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s catalog.RegionOne.volume.name = Volume Service +catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696 +catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696 +catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696 +catalog.RegionOne.network.name = Network Service catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin ++++++ keystone-cs24277.diff ++++++ >From ad39c7b413491cb7c38f4161251e58ca4248458d Mon Sep 17 00:00:00 2001 From: Dan Prince <dprince(a)redhat.com> Date: Tue, 12 Mar 2013 22:44:48 -0400 Subject: [PATCH] Remove duplicate password/token opts. We already register these options in config.py so no need to dup them here. Fixes LP Bug #1154406. Change-Id: I301328ec3ec4823dd7fbec1e639e2841516352e5 --- keystone/auth/controllers.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index 517995d..ba70735 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -36,15 +36,6 @@ CONF = config.CONF AUTH_METHODS = {} -# register method drivers -for method_name in CONF.auth.methods: - try: - config.register_str(method_name, group='auth') - except Exception as e: - # don't care about duplicate error - LOG.warn(e) - - def load_auth_method(method_name): if method_name not in CONF.auth.methods: raise exception.AuthMethodNotSupported() -- 1.8.1.4 ++++++ openstack-keystone.init ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -4,74 +4,68 @@ # Provides: openstack-keystone # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog -# Should-Start: $network mysql postgresql -# Should-Stop: $network mysql postgresql +# Should-Start: mysql postgresql +# Should-Stop: mysql postgresql # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: OpenStack keystone -# Description: OpenStack keystone. +# Short-Description: OpenStack Identity (Keystone) +# Description: OpenStack Identity (Keystone) ### END INIT INFO USER="openstack-keystone" -GROUP="openstack-keystone" -DAEMON="/usr/bin/keystone-all" CONFFILE="/etc/keystone/keystone.conf" +RUNDIR="/var/run/Keystone" -DAEMON_OPTIONS="--config-file=$CONFFILE --log-file=/var/log/keystone/keystone.log" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" +# $RUNDIR can be tmpfs, thus we have to create/own it here: +mkdir -p $RUNDIR && chown $USER. $RUNDIR -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack Keystone" - case "$1" in start) - echo -n "Starting $FULLNAME" - cd /var/lib/keystone - startproc -s -u $USER -t ${STARTUP_TIMEOUT:-5} -q $DAEMON $OPTIONS + echo -n "Starting keystone" + /sbin/startproc -q -s -u $USER /usr/bin/keystone-all --config-file=$CONFFILE rc_status -v ;; stop) - echo -n "Shutting down $FULLNAME" - killproc $DAEMON + echo -n "Shutting down keystone" + /sbin/killproc /usr/bin/keystone-all rc_status -v ;; restart) $0 stop - $0 start - rc_status + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status ;; reload) + echo -n "Reload service keystone" + rc_failed 3 + rc_status -v ;; status) - echo -n "Checking $FULLNAME" - /sbin/checkproc $DAEMON - rc_status -v + echo -n "Checking for service keystone" + /sbin/checkproc /usr/bin/keystone-all + rc_status -v ;; - condrestart|try-restart) + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi $0 status if test $? = 0; then - $0 restart + $0 restart else - rc_reset # Not running is not a failure. + rc_reset # Not running is not a failure. fi - # Remember status and be quiet - rc_status + rc_status # Remember status and be quiet ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac -exit $? +rc_exit ++++++ openstack-keystone.logrotate ++++++ --- /var/tmp/diff_new_pack.LIAVut/_old 2013-04-29 14:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.LIAVut/_new 2013-04-29 14:09:45.000000000 +0200 @@ -1,5 +1,13 @@ +compress + /var/log/keystone/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifyempty su openstack-keystone openstack-keystone + copytruncate + sharedscripts } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0