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

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index e577ef82d..4d1410f65 100644
--- a/centos7/rpm/SPECS/openstack-neutron.spec
+++ b/centos7/rpm/SPECS/openstack-neutron.spec
@@ -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
@@ -461,22 +460,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 +523,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 +717,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 +878,8 @@ fi
 
 
 %changelog
+* 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