diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-23 12:38:15 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-26 07:53:38 +0000 |
| commit | baa100674751f9f1957354fb842a5913e7da6539 (patch) | |
| tree | f87093cedbd8ee83700b10f6ea3bb36cbf1a3cf9 /etc/nova/rootwrap.d | |
| parent | d5620b2f5a7d2e0e9890758485b4732352e4287b (diff) | |
| download | nova-baa100674751f9f1957354fb842a5913e7da6539.tar.gz nova-baa100674751f9f1957354fb842a5913e7da6539.tar.xz nova-baa100674751f9f1957354fb842a5913e7da6539.zip | |
Make nova-dhcpbridge use CONFIG_FILE over FLAGFILE
nova-dhcpbridge's FLAGFILE environment variable is one of the few
remaining references we have to "flags".
Switching to use a new environment variable is easy, but we need
to take care that when you upgrade the code the compute and network
services might not be restarted immediately.
If this happens, the services may launch a new dnsmasq (so rootwrap
needs to continue to support FLAGFILE) or an existing dnsmasq might run
the lease script (so the script needs to support FLAGFILE).
Change-Id: Ieb55daa2507abb8327c7f5a2ef2f682740f31a5d
Diffstat (limited to 'etc/nova/rootwrap.d')
| -rw-r--r-- | etc/nova/rootwrap.d/compute.filters | 1 | ||||
| -rw-r--r-- | etc/nova/rootwrap.d/network.filters | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/etc/nova/rootwrap.d/compute.filters b/etc/nova/rootwrap.d/compute.filters index db9ee2636..74d5a3aeb 100644 --- a/etc/nova/rootwrap.d/compute.filters +++ b/etc/nova/rootwrap.d/compute.filters @@ -148,6 +148,7 @@ kill_radvd: KillFilter, root, /usr/sbin/radvd # nova/network/linux_net.py: dnsmasq call dnsmasq: DnsmasqFilter, /usr/sbin/dnsmasq, root +dnsmasq_deprecated: DeprecatedDnsmasqFilter, /usr/sbin/dnsmasq, root # nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'.. radvd: CommandFilter, /usr/sbin/radvd, root diff --git a/etc/nova/rootwrap.d/network.filters b/etc/nova/rootwrap.d/network.filters index c635f12e4..9b6af8565 100644 --- a/etc/nova/rootwrap.d/network.filters +++ b/etc/nova/rootwrap.d/network.filters @@ -63,6 +63,7 @@ kill_radvd: KillFilter, root, /usr/sbin/radvd # nova/network/linux_net.py: dnsmasq call dnsmasq: DnsmasqFilter, /usr/sbin/dnsmasq, root +dnsmasq_deprecated: DeprecatedDnsmasqFilter, /usr/sbin/dnsmasq, root # nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'.. radvd: CommandFilter, /usr/sbin/radvd, root |