From 8350862a4a94a09a61141f9c5769329ff7e7c51c Mon Sep 17 00:00:00 2001 From: Sebastian Rieger Date: Fri, 12 Apr 2024 14:10:21 +0200 Subject: [PATCH] fixed type in cloud-init for microservice worker, removed rabitmq fix as it is not needed anymore --- demo3_microservice.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/demo3_microservice.py b/demo3_microservice.py index bef866f..1fbb48b 100644 --- a/demo3_microservice.py +++ b/demo3_microservice.py @@ -192,21 +192,11 @@ def main(): # noqa: C901 pylint: disable=too-many-branches,too-many-statements, # ########################################################################### - # https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh - # is currently broken, hence the "rabbitctl" lines were added in the example - # below, see also https://bugs.launchpad.net/faafo/+bug/1679710 - # - # Thanks to Stefan Friedmann for finding this fix ;) - # TODO: still needed for new version of faafo and Ubuntu 22.04? - userdata = '#!/usr/bin/env bash\n' \ 'curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-' \ 'examples/raw/master/faafo/contrib/install.sh | bash -s -- ' \ - '-i messaging -i faafo -r api\n' \ - 'rabbitmqctl add_user faafo guest\n' \ - 'rabbitmqctl set_user_tags faafo administrator\n' \ - 'rabbitmqctl set_permissions -p / faafo ".*" ".*" ".*"\n' - print('\nUsing cloud-init userdata:\n"' + userdata + '"\n') + '-i messaging -i faafo -r api\n' + print('\nUsing cloud-init userdata for controller:\n"' + userdata + '"\n') print('Starting new app-controller instance and wait until it is running...') instance_controller_1 = conn.create_node(name='app-controller', @@ -265,8 +255,8 @@ def main(): # noqa: C901 pylint: disable=too-many-branches,too-many-statements, 'curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-' \ 'examples/raw/master/faafo/contrib/install.sh | bash -s -- ' \ f'-i faafo -r worker -e "http://{ip_controller}" -m "amqp://faafo:guest@' \ - f'{ip_controller}:5672/\n' - print('\nUsing cloud-init userdata:\n"' + userdata + '"\n') + f'{ip_controller}:5672/"\n' + print('\nUsing cloud-init userdata for worker:\n"' + userdata + '"\n') print('Starting new app-worker-1 instance and wait until it is running...') instance_worker_1 = conn.create_node(name='app-worker-1',