Add missing data bridge
This commit is contained in:
4
hooks/fabfile.py
vendored
4
hooks/fabfile.py
vendored
@@ -31,8 +31,8 @@ def restart_service(service):
|
||||
sudo('service %s restart' % service)
|
||||
|
||||
|
||||
def add_bridge():
|
||||
sudo('ovs-vsctl -- --may-exist add-br br-int')
|
||||
def add_bridge(bridge_name):
|
||||
sudo('ovs-vsctl -- --may-exist add-br %' % bridge_name)
|
||||
|
||||
|
||||
def enable_shell(user):
|
||||
|
||||
@@ -102,6 +102,7 @@ def relation_broken():
|
||||
|
||||
@hooks.hook('upgrade-charm')
|
||||
def upgrade_charm():
|
||||
proxy.install()
|
||||
for r_id in relation_ids('amqp'):
|
||||
amqp_joined(relation_id=r_id)
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ class POWERProxy():
|
||||
execute(fix_ml2_plugin_config)
|
||||
|
||||
def configure(self):
|
||||
self.add_bridge()
|
||||
self.add_bridges()
|
||||
|
||||
def copy_file(self, target):
|
||||
execute(copy_file_as_root,
|
||||
@@ -115,8 +115,9 @@ class POWERProxy():
|
||||
def restart_service(self, service):
|
||||
execute(restart_service, service)
|
||||
|
||||
def add_bridge(self):
|
||||
execute(add_bridge)
|
||||
def add_bridges(self):
|
||||
execute(add_bridge, 'br-int')
|
||||
execute(add_bridge, 'br-data')
|
||||
|
||||
def enable_shell(self, user):
|
||||
execute(enable_shell, user)
|
||||
|
||||
Reference in New Issue
Block a user