[openstack-keystone/el6-havana: 8/9] Merge branch 'master' into el6-havana

[Alan Pevec]

commit a65b4e897181741b307c03e9b09622b21a44ae92
Merge: 9e75c94 237c9fa
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Sep 9 23:57:29 2013 +0200

    Merge branch 'master' into el6-havana

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   52 ++++++
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |  176 ++++++++++++++++++++
 ...-parameter-values-with-keystone-dist.conf.patch |   55 ++++++
 keystone-dist.conf                                 |   30 ++++
 openstack-keystone-sample-data                     |    2 +-
 openstack-keystone.spec                            |   57 ++++---
 sources                                            |    2 +-
 8 files changed, 349 insertions(+), 26 deletions(-)
---
diff --cc openstack-keystone.spec
index 74bc397,f6b2891..071d243
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -16,36 -16,31 +16,39 @@@ URL:            http://keystone.opensta
  #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}.b%{milestone}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
+ Source20:       keystone-dist.conf
  
 +Patch0:       openstack-keystone-newdeps.patch
  
  #
- # patches_base=2013.2.b2
+ # patches_base=2013.2.b3
  #
+ Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
+ Patch0002: 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+ Patch0003: 0003-sync-parameter-values-with-keystone-dist.conf.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 -BuildRequires:  systemd-units
 +BuildRequires:  python-sphinx10
- BuildRequires:  openstack-utils
  BuildRequires:  python-pbr
  BuildRequires:  python-d2to1
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.0
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
- Requires:       python-keystoneclient >= 1:0.2.0
+ Requires:       python-keystoneclient >= 1:0.3.0
  
 -Requires(post):   systemd-units
 -Requires(preun):  systemd-units
 -Requires(postun): systemd-units
 +Requires(post):   chkconfig
 +Requires(postun): initscripts
 +Requires(preun):  chkconfig
 +Requires(preun):  initscripts
  Requires(pre):    shadow-utils
  
  %description
@@@ -97,8 -94,10 +103,11 @@@ This package contains documentation fo
  
  %prep
  %setup -q -n keystone-%{version}.b%{milestone}
 +%patch0 -p1 -b .newdeps
  
+ %patch0001 -p1
+ %patch0002 -p1
+ %patch0003 -p1
  sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
  
  find . \( -name .gitignore -o -name .placeholder \) -delete
@@@ -139,10 -131,9 +141,10 @@@ install -p -D -m 640 etc/logging.conf.s
  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
 -install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
 +install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-keystone
  # Install sample data script.
- install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/%{name}/sample_data.sh
- install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}/%{name}.upstart
+ install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
++install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/keystone/%{name}.upstart
  install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
  
  install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
@@@ -213,11 -190,13 +215,13 @@@ f
  %{_bindir}/keystone-all
  %{_bindir}/keystone-manage
  %{_bindir}/openstack-keystone-sample-data
- %{_datadir}/%{name}
+ %dir %{_datadir}/keystone
+ %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist.conf
+ %attr(0640, root, keystone) %{_datadir}/keystone/keystone-dist-paste.ini
+ %attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
 -%{_unitdir}/openstack-keystone.service
 +%{_initrddir}/openstack-keystone
  %dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
  %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
- %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone-paste.ini
  %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
@@@ -239,8 -216,13 +243,13 @@@
  %endif
  
  %changelog
+ * Mon Sep 09 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.8.b3
+ - havana-3 milestone
+ - drop pbr run-time dependency
+ - set distribution defaults in keystone-dist.conf
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.2-0.5.b2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +* Tue Jul 23 2013 pbrady at redhat.com 2013.2-0.5.b2
 +- Ensure service start waits until service is available
  
  * Thu Jul 18 2013 pbrady at redhat.com 2013.2-0.4.b2
  - havana-2 milestone