openstack/charm-nova-compute
Code Issues Proposed changes

Switch to using common vhost for all openstack services

Browse Source
This commit is contained in:
James Page 2013-10-17 20:25:15 +01:00
parent 812fafd5b7
commit c323f70a5c
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -23,7 +23,7 @@ options:
type: string type: string
description: Username used to access rabbitmq queue description: Username used to access rabbitmq queue
rabbit-vhost: rabbit-vhost:
default: nova default: openstack
type: string type: string
decsription: Rabbitmq vhost decsription: Rabbitmq vhost
database-user: database-user:

12
hooks/nova_compute_hooks.py
View File

@ -82,8 +82,10 @@ def config_changed():
@hooks.hook('amqp-relation-joined') @hooks.hook('amqp-relation-joined')
@restart_on_change(restart_map()) @restart_on_change(restart_map())
def amqp_joined(): def amqp_joined(relation_id=None):
relation_set(username=config('rabbit-user'), vhost=config('rabbit-vhost')) relation_set(relation_id=relation_id,
username=config('rabbit-user'),
vhost=config('rabbit-vhost'))
@hooks.hook('amqp-relation-changed') @hooks.hook('amqp-relation-changed')
@ -199,6 +201,12 @@ def relation_broken():
CONFIGS.write_all() CONFIGS.write_all()
@hooks.hook('upgrade-charm')
def upgrade_charm():
for r_id in relation_ids('amqp'):
amqp_joined(relation_id=r_id)
def main(): def main():
try: try:
hooks.execute(sys.argv) hooks.execute(sys.argv)

1
hooks/upgrade-charm Symbolic link
View File

@ -0,0 +1 @@
nova_compute_hooks.py

3
unit_tests/test_nova_compute_hooks.py
View File

@ -105,7 +105,8 @@ class NovaComputeRelationsTests(CharmTestCase):
def test_amqp_joined(self): def test_amqp_joined(self):
hooks.amqp_joined() hooks.amqp_joined()
self.relation_set.assert_called_with(username='nova', vhost='nova') self.relation_set.assert_called_with(username='nova', vhost='openstack',
relation_id=None)
@patch.object(hooks, 'CONFIGS') @patch.object(hooks, 'CONFIGS')
def test_amqp_changed_missing_relation_data(self, configs): def test_amqp_changed_missing_relation_data(self, configs):