X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=centos7%2Frpm%2FSPECS%2Fopenstack-neutron.spec;h=d28233009aae74a2c8fa7a63677e88729517ab80;hb=918a1006753f6c64d5f6240a602b0e4499469921;hp=e577ef82d3ad42f17acae24856e89a33bf5f3506;hpb=f434d0b4aa31eaa1e6bad0a670c1cb0d08acc64c;p=openstack-build%2Fneutron-build.git

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index e577ef82d..d28233009 100644
--- a/centos7/rpm/SPECS/openstack-neutron.spec
+++ b/centos7/rpm/SPECS/openstack-neutron.spec
@@ -1,8 +1,8 @@
 %global service neutron
 
 Name:       openstack-%{service}
-Version:    7.0.0.0b3
-Release:    1%{?dist}
+Version:    7.0.0
+Release:    1%{?dist}~mos8.0.1
 Epoch:      1
 Summary:    OpenStack Networking Service
 
@@ -28,7 +28,6 @@ Source24:   neutron-ovs-cleanup.init
 Source28:   neutron-dev-server.service
 Source29:   neutron-rpc-server.service
 
-Source30:   %{service}-dist.conf
 Source31:   conf.README
 
 BuildArch:  noarch
@@ -99,6 +98,7 @@ Requires:   python-keystonemiddleware >= 2.0.0
 Requires:   python-netaddr >= 0.7.12
 Requires:   python-neutronclient >= 2.6.0
 Requires:   python-novaclient >= 1:2.26.0
+Requires:   python-openvswitch
 Requires:   python-oslo-concurrency >= 2.3.0
 Requires:   python-oslo-config >= 2:2.1.0
 Requires:   python-oslo-context >= 0.2.0
@@ -461,22 +461,6 @@ rm -rf neutron.egg-info
 export SKIP_PIP_INSTALL=1
 %{__python2} setup.py build
 
-# Loop through values in neutron-dist.conf and make sure that the values
-# are substituted into the neutron.conf as comments. Some of these values
-# will have been uncommented as a way of upstream setting defaults outside
-# of the code. For notification_driver, there are commented examples
-# above uncommented settings, so this specifically skips those comments
-# and instead comments out the actual settings and substitutes the
-# correct default values.
-while read name eq value; do
-  test "$name" && test "$value" || continue
-  if [ "$name" = "notification_driver" ]; then
-    sed -ri "0,/^$name *=/{s!^$name *=.*!# $name = $value!}" etc/%{service}.conf
-  else
-    sed -ri "0,/^(#)? *$name *=/{s!^(#)? *$name *=.*!# $name = $value!}" etc/%{service}.conf
-  fi
-done < %{SOURCE30}
-
 %install
 # pbr does not like dashes in version strings, neither it likes fc* prefixes (dev* is fine)
 #export PBR_VERSION=%{version}.%(echo %{release} | sed 's/%{?dist}//')
@@ -540,9 +524,6 @@ install -d -m 755 %{buildroot}%{_sharedstatedir}/%{service}
 install -d -m 755 %{buildroot}%{_localstatedir}/log/%{service}
 install -d -m 755 %{buildroot}%{_localstatedir}/run/%{service}
 
-# Install dist conf
-install -p -D -m 640 %{SOURCE30} %{buildroot}%{_datadir}/%{service}/%{service}-dist.conf
-
 # Create and populate configuration directory for L3 agent that is not accessible for user modification
 mkdir -p %{buildroot}%{_datadir}/%{service}/l3_agent
 ln -s %{_sysconfdir}/%{service}/l3_agent.ini %{buildroot}%{_datadir}/%{service}/l3_agent/l3_agent.conf
@@ -737,7 +718,6 @@ fi
 %dir %{_sysconfdir}/%{service}/conf.d
 %dir %{_sysconfdir}/%{service}/conf.d/common
 %dir %{_sysconfdir}/%{service}/plugins
-%attr(-, root, %{service}) %{_datadir}/%{service}/%{service}-dist.conf
 %config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/%{service}.conf
 %config(noreplace) %{_sysconfdir}/%{service}/rootwrap.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/*
@@ -899,6 +879,10 @@ fi
 
 
 %changelog
+* Tue Dec 15 2015 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:7.0.0-1%{?dist}~mos8.0.1
+- Add python-openvswitch package dependency
+* Fri Nov 20 2015 Sergey Kolekonov <skolekonov@mirantis.com> 7.0.0
+- Remove neutron-dist.conf from packages
 * Fri Nov 6 2015 Sergey Kolekonov <skolekonov@mirantis.com> 7.0.0
 - Update specs for 7.0.0 release
 * Thu Sep 3 2015 Sergey Kolekonov <skolekonov@mirantis.com> 7.0.0.0b3