Add missing data bridge

This commit is contained in:
James Page
2014-11-10 11:12:31 +00:00
parent ed9b89aeff
commit 59a7e7d122
3 changed files with 7 additions and 5 deletions

4
hooks/fabfile.py vendored
View File

@@ -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):

View File

@@ -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)

View File

@@ -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)