summaryrefslogtreecommitdiffstats
path: root/build/rpm_specs
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-05-28 02:22:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-28 02:22:17 +0000
commit742be8f455b9526fd32fc903aedc2608c90ead93 (patch)
tree3256767908d20610d6b7ee89f8b245a7def6a62e /build/rpm_specs
parentadf74f577852779302ed77b1d45584af9830c1e2 (diff)
parentfb5885ab7cc0ab76a0bcc5c4e8fc3ba1d10e34ae (diff)
Merge "Fix tacker not starting correctly" into stable/danube
Diffstat (limited to 'build/rpm_specs')
-rw-r--r--build/rpm_specs/openstack-tacker-server.service2
-rw-r--r--build/rpm_specs/openstack-tacker.spec4
2 files changed, 2 insertions, 4 deletions
diff --git a/build/rpm_specs/openstack-tacker-server.service b/build/rpm_specs/openstack-tacker-server.service
index 9bf16cd5..44191f70 100644
--- a/build/rpm_specs/openstack-tacker-server.service
+++ b/build/rpm_specs/openstack-tacker-server.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=tacker
-ExecStart=/usr/bin/openstack-tacker-server --config-file /usr/share/tacker/tacker-dist.conf --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log
+ExecStart=/usr/bin/tacker-server --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log
PrivateTmp=true
NotifyAccess=all
KillMode=process
diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec
index 0ec4d518..64761a50 100644
--- a/build/rpm_specs/openstack-tacker.spec
+++ b/build/rpm_specs/openstack-tacker.spec
@@ -37,9 +37,6 @@ rm -fr %{buildroot}/etc/init.d
# Install systemd script
install -p -D -m 644 openstack-tacker-server.service %{buildroot}%{_unitdir}/openstack-tacker-server.service
-# Remove egg-info
-rm -rf %{buildroot}/usr/lib/python2.7/site-packages/*egg-info
-
install -d -m 755 %{buildroot}%{_localstatedir}/cache/tacker
install -d -m 755 %{buildroot}%{_sharedstatedir}/tacker
install -d -m 755 %{buildroot}%{_localstatedir}/log/tacker
@@ -66,6 +63,7 @@ exit 0
/usr/bin/tacker-rootwrap
%{_unitdir}/openstack-tacker-server.service
/usr/lib/python2.7/site-packages/tacker/*
+/usr/lib/python2.7/site-packages/tacker-*.egg-info
#%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/tacker.conf`
%{_sysconfdir}/rootwrap.d/tacker.filters