changed Ubuntu to 20.04, made python3 the default while installing faafo, added comment to show use of different faafo branches for cloud-init
This commit is contained in:
@ -26,8 +26,8 @@ project_name = 'CloudComp' + str(group_number)
|
||||
project_network = 'CloudComp' + str(group_number) + '-net'
|
||||
|
||||
# The image to look for and use for the started instance
|
||||
ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
|
||||
# TODO: Ubuntu >18.04 would require major updates to faafo example again/better option: complete rewrite of example?
|
||||
#ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
|
||||
ubuntu_image_name = "Ubuntu 20.04 - Focal Fossa - 64-bit - Cloud Based Image"
|
||||
|
||||
# The public key to be used for SSH connection, please make sure, that you have the corresponding private key
|
||||
#
|
||||
@ -232,8 +232,12 @@ def main():
|
||||
#
|
||||
# Thanks to Stefan Friedmann for finding this fix ;)
|
||||
|
||||
#hsfd_faafo_cloud_init_script = 'https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/master/faafo/contrib/install.sh'
|
||||
# testing / faafo dev branch:
|
||||
hsfd_faafo_cloud_init_script = 'https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/branch/dev_faafo/faafo/contrib/install.sh'
|
||||
|
||||
userdata_service = '''#!/usr/bin/env bash
|
||||
curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/master/faafo/contrib/install.sh | bash -s -- \
|
||||
curl -L -s ''' + hsfd_faafo_cloud_init_script + ''' | bash -s -- \
|
||||
-i database -i messaging
|
||||
rabbitmqctl add_user faafo guest
|
||||
rabbitmqctl set_user_tags faafo administrator
|
||||
@ -259,7 +263,7 @@ def main():
|
||||
###########################################################################
|
||||
|
||||
userdata_api = '''#!/usr/bin/env bash
|
||||
curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/master/faafo/contrib/install.sh | bash -s -- \
|
||||
curl -L -s ''' + hsfd_faafo_cloud_init_script + ''' | bash -s -- \
|
||||
-i faafo -r api -m 'amqp://faafo:guest@%(services_ip)s:5672/' \
|
||||
-d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo'
|
||||
''' % {'services_ip': services_ip}
|
||||
@ -301,12 +305,12 @@ def main():
|
||||
###########################################################################
|
||||
|
||||
userdata_worker = '''#!/usr/bin/env bash
|
||||
curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/master/faafo/contrib/install.sh | bash -s -- \
|
||||
curl -L -s ''' + hsfd_faafo_cloud_init_script + ''' | bash -s -- \
|
||||
-i faafo -r worker -e 'http://%(api_1_ip)s' -m 'amqp://faafo:guest@%(services_ip)s:5672/'
|
||||
''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}
|
||||
|
||||
# userdata_api-api-2 = '''#!/usr/bin/env bash
|
||||
# curl -L -s https://gogs.informatik.hs-fulda.de/srieger/cloud-computing-msc-ai-examples/raw/master/faafo/contrib/install.sh | bash -s -- \
|
||||
# curl -L -s ''' + hsfd_faafo_cloud_init_script + ''' | bash -s -- \
|
||||
# -i faafo -r worker -e 'http://%(api_2_ip)s' -m 'amqp://faafo:guest@%(services_ip)s:5672/'
|
||||
# ''' % {'api_2_ip': api_2_ip, 'services_ip': services_ip}
|
||||
|
||||
|
Reference in New Issue
Block a user