Remove bridge-utils/brctl usage
This package isn't available on some distributions hasn't been
required in Neutron for several years
If679e79fa3242ee1cd8610b5525deca35b41c87e.  Remove it.
Change-Id: I7308a885c1d084efe2f0b9f542443d35966140ed
(cherry picked from commit 1147300b9c)
			
			
This commit is contained in:
		
				
					committed by
					
						
						Mohammed Naser
					
				
			
			
				
	
			
			
			
						parent
						
							d018a05712
						
					
				
				
					commit
					2f20a6ede6
				
			@@ -1,7 +1,6 @@
 | 
			
		||||
apache2
 | 
			
		||||
apache2-dev
 | 
			
		||||
bc
 | 
			
		||||
bridge-utils
 | 
			
		||||
bsdmainutils
 | 
			
		||||
curl
 | 
			
		||||
default-jre-headless  # NOPRIME
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
apache2
 | 
			
		||||
apache2-devel
 | 
			
		||||
bc
 | 
			
		||||
bridge-utils
 | 
			
		||||
ca-certificates-mozilla
 | 
			
		||||
curl
 | 
			
		||||
gcc
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,4 @@
 | 
			
		||||
bc
 | 
			
		||||
bridge-utils
 | 
			
		||||
curl
 | 
			
		||||
dbus
 | 
			
		||||
gcc
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@ function neutron_plugin_create_nova_conf {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function neutron_plugin_install_agent_packages {
 | 
			
		||||
    install_package bridge-utils
 | 
			
		||||
    :
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function neutron_plugin_configure_dhcp_agent {
 | 
			
		||||
 
 | 
			
		||||
@@ -166,8 +166,6 @@ def network_dump():
 | 
			
		||||
    _header("Network Dump")
 | 
			
		||||
 | 
			
		||||
    _dump_cmd("bridge link")
 | 
			
		||||
    if _find_cmd("brctl"):
 | 
			
		||||
        _dump_cmd("brctl show")
 | 
			
		||||
    _dump_cmd("ip link show type bridge")
 | 
			
		||||
    ip_cmds = ["neigh", "addr", "link", "route"]
 | 
			
		||||
    for cmd in ip_cmds + ['netns']:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user