Update rpm to 8.0.0.0b3

- Update to upstream 8.0.0.0b3
- Update requirements
- Add sample config file generation

Change-Id: I9e5c1914b8b040112615232edc00388cc15b6902

diff --git a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
index 7e68e0fee827d0eacfbaa71a7340016f886c9389..29e663a40263d781e4b9a46df78c612616eb8ada 100644 (file)
--- a/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
+++ b/centos7/rpm/SPECS/openstack-neutron-lbaas.spec
@@ -2,31 +2,35 @@
 %global servicename neutron-lbaas
 %global type LBaaS
 
-%global release_name liberty
-
-%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
-
 Name:           openstack-%{servicename}
-Version:        7.0.1
-Release:        1%{?milestone}%{?dist}~mos8.0.1
+Version:        8.0.0~b3
+Release:        1%{?dist}~mos1
 Epoch:          1
 Summary:        Openstack Networking %{type} plugin
 
 License:        ASL 2.0
 URL:            http://launchpad.net/neutron/
-Source0:        http://launchpad.net/neutron/%{release_name}/%{version}/+download/%{servicename}-%{upstream_version}.tar.gz
+Source0:        %{servicename}-%{version}.tar.gz
 Source1:        %{servicename}-agent.service
 Source2:        %{servicename}v2-agent.service
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
+BuildRequires:  python-barbicanclient
+BuildRequires:  python-neutron >= 1:%{version}
+BuildRequires:  python-neutron-lib
 BuildRequires:  python-pbr
+BuildRequires:  python-pyasn1
+BuildRequires:  python-pyasn1-modules
 BuildRequires:  python-setuptools
 BuildRequires:  systemd-units
-BuildRequires: git
+BuildRequires:  git
+# Test deps
+BuildRequires:  python-cryptography
 
 Requires:       python-%{servicename} = %{epoch}:%{version}-%{release}
 Requires:       openstack-neutron >= %{epoch}:%{version}
+Requires:       python-neutron-lib
 
 %description
 This is a %{type} service plugin for Openstack Neutron (Networking) service.
@@ -76,7 +80,7 @@ This package contains Neutron %{type} test files.
 
 
 %prep
-%autosetup -n %{servicename}-%{upstream_version} -S git
+%autosetup -n %{servicename}-%{version} -S git
 
 # Let's handle dependencies ourselves
 rm -f requirements.txt
@@ -89,6 +93,14 @@ export PBR_VERSION=%{version}
 export SKIP_PIP_INSTALL=1
 %{__python2} setup.py build
 
+# Generate configuration files
+PYTHONPATH=. tools/generate_config_file_samples.sh
+find etc -name *.sample | while read filename
+do
+    filedir=$(dirname $filename)
+    file=$(basename $filename .sample)
+    mv ${filename} ${filedir}/${file}
+done
 
 %install
 export PBR_VERSION=%{version}
@@ -101,8 +113,7 @@ mv %{buildroot}/usr/etc/neutron/rootwrap.d/*.filters %{buildroot}%{_datarootdir}
 
 # Move config files to proper location
 install -d -m 755 %{buildroot}%{_sysconfdir}/neutron
-mv %{buildroot}/usr/etc/neutron/*.ini %{buildroot}%{_sysconfdir}/neutron
-mv %{buildroot}/usr/etc/neutron/*.conf %{buildroot}%{_sysconfdir}/neutron
+mv etc/*.ini etc/*.conf %{buildroot}%{_sysconfdir}/neutron
 
 # Install systemd units
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{servicename}-agent.service
@@ -160,6 +171,11 @@ ln -s %{_sysconfdir}/neutron/%{modulename}.conf %{buildroot}%{_datadir}/neutron/
 
 
 %changelog
+* Fri Mar 11 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.0.0~b3-1.el7
+- Update to upstream 8.0.0.0b3
+- Update requirements
+- Add sample config file generations
+
 * Thu Dec 17 2015 Sergey Kolekonov <skolekonov@mirantis.com> - 1:7.0.1-1~mos8.0.1
 - Use mask to package *.egg-info file
 
@@ -176,4 +192,4 @@ ln -s %{_sysconfdir}/neutron/%{modulename}.conf %{buildroot}%{_datadir}/neutron/
 - Update to upstream 7.0.0.0rc1
 
 * Wed Sep 16 2015 Ihar Hrachyshka <ihrachys@redhat.com> 1:7.0.0-0.1.0b3.el7
-- Initial release for Liberty M3.
+- Initial release for Liberty M3.
\ No newline at end of file