Attachment 879893 Details for Bug 1051444 – openstack-neutron.spec patch

[patch] openstack-neutron.spec patch

agent-spec.patch (text/plain), 4.17 KB, created by Miguel Angel Ajo on 2014-03-28 15:02:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Angel Ajo

Created: 2014-03-28 15:02:27 UTC

Size: 4.17 KB

patch

obsolete

>diff --git a/openstack-neutron.spec b/openstack-neutron.spec
>index 96ac817..a81650c 100644
>--- a/openstack-neutron.spec
>+++ b/openstack-neutron.spec
>@@ -47,11 +47,16 @@ Source41:	neutron-vpn-agent.upstart
> Source32:	neutron-metering-agent.init
> Source42:	neutron-metering-agent.upstart
> Source33:   neutron-netns-cleanup.init
>+Source34:	neutron-agent-watch.init
> 
>-Source50:	neutron-db-check
>+Source50:   neutron-db-check
> Source51:	openstack-neutron.sysconfig
> 
> Source90:	neutron-dist.conf
>+
>+Source100:	neutron-agent-watch
>+Source101:	agent_watch.ini
>+
> #
> # patches_base=2013.2.2+2
> #
>@@ -509,6 +514,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/* %{buildroot}%{_sysconfdir}/neutron
>+install -m 640 %{SOURCE101} %{buildroot}%{_sysconfdir}/neutron/agent_watch.ini
> chmod 640  %{buildroot}%{_sysconfdir}/neutron/plugins/*/*.ini
> 
> # Install logrotate
>@@ -532,6 +538,7 @@ install -p -D -m 755 %{SOURCE30} %{buildroot}%{_initrddir}/neutron-mlnx-agent
> install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-vpn-agent
> install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-metering-agent
> install -p -D -m 755 %{SOURCE33} %{buildroot}%{_initrddir}/neutron-netns-cleanup
>+install -p -D -m 755 %{SOURCE34} %{buildroot}%{_initrddir}/neutron-agent-watch
> 
> # Setup directories
> install -d -m 755 %{buildroot}%{_datadir}/neutron
>@@ -568,6 +575,9 @@ install -m 755 %{SOURCE50} %{buildroot}%{_bindir}/neutron-db-check
> install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
> install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/openstack-neutron
> 
>+# Install neutron-agent-watch workaround (HA)
>+install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/neutron-agent-watch
>+
> # Install version info file
> cat > %{buildroot}%{_sysconfdir}/neutron/release <<EOF
> [Neutron]
>@@ -593,6 +603,12 @@ if [ $1 -eq 1 ] ; then
>     done
> fi
> 
>+# always add the services which weren't there from the first spec conception
>+# multiple --add is safe, and doesn't change the on/off status (fabbione)
>+/sbin/chkconfig --add neutron-agent-watch
>+/sbin/chkconfig --add neutron-ovs-cleanup
>+/sbin/chkconfig --add neutron-netns-cleanup
>+
> %preun
> if [ $1 -eq 0 ] ; then
>     # Package removal, not upgrade
>@@ -602,6 +618,10 @@ if [ $1 -eq 0 ] ; then
>       /sbin/service neutron-$agent-agent stop >/dev/null 2>&1
>       /sbin/chkconfig --del neutron-$agent-agent
>     done
>+    /sbin/service neutron-agent-watch stop >/dev/null 2>&1
>+    /sbin/chkconfig --del neutron-agent-watch
>+    /sbin/chkconfig --del neutron-ovs-cleanup
>+    /sbin/chkconfig --del neutron-netns-cleanup
> fi
> 
> %postun
>@@ -612,6 +632,8 @@ if [ $1 -ge 1 ] ; then
>       /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 || :
>     done
> 
>+    /sbin/service neutron-agent-watch condrestart
>+
>     # Fix sudoers file on old installations
>     sed -i 's/^neutron ALL = $root$ NOPASSWD: SETENV: \/usr\/bin\/neutron-rootwrap$/neutron ALL = (root) NOPASSWD: \/usr\/bin\/neutron-rootwrap \/etc\/neutron\/rootwrap.conf' /etc/sudoers.d/neutron
>     if [ -f /etc/sudoers.d/neutron ]; then
>@@ -839,8 +861,8 @@ fi
> %{_bindir}/neutron-server
> %{_bindir}/neutron-server-setup
> %{_bindir}/neutron-usage-audit
>-
> %{_bindir}/neutron-db-check
>+%{_bindir}/neutron-agent-watch
> 
> %{_initrddir}/neutron-server
> %{_initrddir}/neutron-dhcp-agent
>@@ -849,6 +871,7 @@ fi
> %{_initrddir}/neutron-ovs-cleanup
> %{_initrddir}/neutron-netns-cleanup
> %{_initrddir}/neutron-lbaas-agent
>+%{_initrddir}/neutron-agent-watch
> %dir %{_datadir}/neutron
> %{_datadir}/neutron/neutron-server.upstart
> %{_datadir}/neutron/neutron-dhcp-agent.upstart
>@@ -866,6 +889,7 @@ fi
> %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini
> %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
> %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
>+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/agent_watch.ini
> %config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
> %config %{_sysconfdir}/sysconfig/openstack-neutron
> %dir %{_sysconfdir}/neutron/plugins

Actions: View | Diff

Attachments on bug 1051444: 879889 | 879890 | 879891 | 879892 | 879893