openstack/charm-nova-compute-proxy
Code Issues Proposed changes

Add missing data bridge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/fabfile.py vendored
View File

@@ -31,8 +31,8 @@ def restart_service(service):
sudo('service %s restart' % service) sudo('service %s restart' % service)
def add_bridge(): def add_bridge(bridge_name):
sudo('ovs-vsctl -- --may-exist add-br br-int') sudo('ovs-vsctl -- --may-exist add-br %' % bridge_name)
def enable_shell(user): def enable_shell(user):

1
hooks/nova_compute_hooks.py
View File

@@ -102,6 +102,7 @@ def relation_broken():
@hooks.hook('upgrade-charm') @hooks.hook('upgrade-charm')
def upgrade_charm(): def upgrade_charm():
proxy.install()
for r_id in relation_ids('amqp'): for r_id in relation_ids('amqp'):
amqp_joined(relation_id=r_id) amqp_joined(relation_id=r_id)

7
hooks/nova_compute_proxy.py
View File

@@ -105,7 +105,7 @@ class POWERProxy():
execute(fix_ml2_plugin_config) execute(fix_ml2_plugin_config)
def configure(self): def configure(self):
self.add_bridge() self.add_bridges()
def copy_file(self, target): def copy_file(self, target):
execute(copy_file_as_root, execute(copy_file_as_root,
@@ -115,8 +115,9 @@ class POWERProxy():
def restart_service(self, service): def restart_service(self, service):
execute(restart_service, service) execute(restart_service, service)
def add_bridge(self): def add_bridges(self):
execute(add_bridge) execute(add_bridge, 'br-int')
execute(add_bridge, 'br-data')
def enable_shell(self, user): def enable_shell(self, user):
execute(enable_shell, user) execute(enable_shell, user)