From d75edaf290adf1909dca6dcafde8558741f9ce6c Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: May 25 2012 10:22:34 +0000 Subject: folsom-1 milestone --- diff --git a/.gitignore b/.gitignore index af4a28e..15be487 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/keystone-2012.1.tar.gz +/keystone-2012.2~f1.tar.gz diff --git a/0001-Make-import_nova_auth-only-create-roles-which-don-t-.patch b/0001-Make-import_nova_auth-only-create-roles-which-don-t-.patch deleted file mode 100644 index 65c1c46..0000000 --- a/0001-Make-import_nova_auth-only-create-roles-which-don-t-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From aff45d69a73033241531f5e3542a8d1782ddd859 Mon Sep 17 00:00:00 2001 -From: Mark McLoughlin -Date: Fri, 30 Mar 2012 12:17:48 +0100 -Subject: [PATCH] Make import_nova_auth only create roles which don't already - exist - -Fixes bug #969088 - -If a role already exists, there's no particular need for import_nova_auth -to barf. Instead, we should just use the existing role. - -Change-Id: I18ae38af62b4c2b2423e20e436611fc30f844ae1 ---- - keystone/common/sql/nova.py | 5 ++++- - tests/test_migrate_nova_auth.py | 9 +++++++++ - 2 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/keystone/common/sql/nova.py b/keystone/common/sql/nova.py -index 2f05fe8..01b14d9 100644 ---- a/keystone/common/sql/nova.py -+++ b/keystone/common/sql/nova.py -@@ -85,8 +85,11 @@ def _create_memberships(api, memberships, user_map, tenant_map): - - - def _create_roles(api, roles): -- role_map = {} -+ role_map = dict((r['name'], r['id']) for r in api.list_roles()) - for role in roles: -+ if role in role_map: -+ LOG.debug('Ignoring existing role %s' % role) -+ continue - role_dict = { - 'id': _generate_uuid(), - 'name': role, -diff --git a/tests/test_migrate_nova_auth.py b/tests/test_migrate_nova_auth.py -index 1be59b1..76b4a60 100644 ---- a/tests/test_migrate_nova_auth.py -+++ b/tests/test_migrate_nova_auth.py -@@ -14,6 +14,8 @@ - # License for the specific language governing permissions and limitations - # under the License. - -+import uuid -+ - from keystone.common.sql import nova - from keystone.common.sql import util as sql_util - from keystone import config -@@ -73,7 +75,14 @@ class MigrateNovaAuth(test.TestCase): - self.identity_api = identity_sql.Identity() - self.ec2_api = ec2_sql.Ec2() - -+ def _create_role(self, role_name): -+ role_id = uuid.uuid4().hex -+ role_dict = {'id': role_id, 'name': role_name} -+ self.identity_api.create_role(role_id, role_dict) -+ - def test_import(self): -+ self._create_role('role1') -+ - nova.import_auth(FIXTURE) - - users = {} diff --git a/openstack-keystone.spec b/openstack-keystone.spec index c148006..0848d41 100644 --- a/openstack-keystone.spec +++ b/openstack-keystone.spec @@ -1,34 +1,28 @@ # -# This is 2012.1 essex release +# This is 2012.2 folsom-1 milestone # -%global release_name essex -%global release_letter rc -%global milestone 2 -%global snapdate 20120404 -%global git_revno r2201 +%global release_name folsom +%global release_letter f +%global milestone 1 +%global snapdate 20120523 +%global git_revno r2300 %global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno} Name: openstack-keystone -Version: 2012.1 -Release: 3%{?dist} -#Release: 0.1.%{release_letter}%{milestone}%{?dist} +Version: 2012.2 +Release: 0.1.%{release_letter}%{milestone}%{?dist} Summary: OpenStack Identity Service License: ASL 2.0 URL: http://keystone.openstack.org/ -Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz -#Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz +#Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz +Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz #Source0: http://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz Source1: openstack-keystone.logrotate Source2: openstack-keystone.service Source5: openstack-keystone-sample-data -# -# patches_base=2012.1 -# -Patch0001: 0001-Make-import_nova_auth-only-create-roles-which-don-t-.patch - BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-sphinx >= 1.0 @@ -96,14 +90,13 @@ This package contains the Keystone Authentication Middleware. %prep %setup -q -n keystone-%{version} -%patch0001 -p1 - find . \( -name .gitignore -o -name .placeholder \) -delete find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \; %build # change default configuration +cp etc/keystone.conf.sample etc/keystone.conf openstack-config --set etc/keystone.conf DEFAULT log_file %{_localstatedir}/log/keystone/keystone.log openstack-config --set etc/keystone.conf sql connection mysql://keystone:keystone@localhost/keystone openstack-config --set etc/keystone.conf catalog template_file %{_sysconfdir}/keystone/default_catalog.templates @@ -123,6 +116,7 @@ rm -fr %{buildroot}%{python_sitelib}/run_tests.* install -d -m 755 %{buildroot}%{_sysconfdir}/keystone install -p -D -m 640 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf +install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf install -p -D -m 640 etc/default_catalog.templates %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates install -p -D -m 640 etc/policy.json %{buildroot}%{_sysconfdir}/keystone/policy.json install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone @@ -186,6 +180,7 @@ fi %{_unitdir}/openstack-keystone.service %dir %{_sysconfdir}/keystone %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf +%config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/logging.conf %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates %config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/policy.json %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone @@ -206,6 +201,9 @@ fi %{python_sitelib}/keystone/middleware/auth_token.py* %changelog +* Fri May 25 2012 Alan Pevec 2012.2-0.1.f1 +- folsom-1 milestone + * Thu May 24 2012 Alan Pevec 2012.1-3 - python-keystone-auth-token subpackage (rhbz#824034) - use reserved user id for keystone (rhbz#752842) diff --git a/sources b/sources index 6538cd3..329a3a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf35c5f1794c237f92486cb7d30133b3 keystone-2012.1.tar.gz +797f89850e20ec6ff24e65a3f4b80ec7 keystone-2012.2~f1.tar.gz