diff --git a/demo2-instance-with-init-script.py b/demo2-instance-with-init-script.py index 387cc54..3ad1111 100644 --- a/demo2-instance-with-init-script.py +++ b/demo2-instance-with-init-script.py @@ -178,8 +178,12 @@ def main(): # noqa: C901 pylint: disable=too-many-branches,too-many-statements, # new repo on git-ce.rwth-aachen.de: hsfd_faafo_cloud_init_script = 'https://git.emin.software/haxala1r/cloud-computing-msc-ai-examples/raw/branch/main/faafo/contrib/install.sh' - + + appid = "d69be046470a4d7a947bf8cc3f7fb260" + appsecret = "tX_SSPqbYgQ8bkRRXgeBGxalAPXXiOpLrTAtTk3c79ijFDoFIIrPzTZIEs7NMpBwBT-z9FtJCy3hyjW1-AJmbQ" userdata = '#!/usr/bin/env bash\n' \ + f'export APPCRED_ID="{appid}"\n' \ + f'export APPCRED_SECRET="{appsecret}"\n' \ f'curl -L -s {hsfd_faafo_cloud_init_script} | bash -s -- ' \ '-i faafo -i messaging -r api -r worker -r demo\n' print('\nUsing cloud-init userdata:\n"' + userdata + '"\n') diff --git a/faafo/faafo/api/service.py b/faafo/faafo/api/service.py index 49c2a55..d4d3fcb 100644 --- a/faafo/faafo/api/service.py +++ b/faafo/faafo/api/service.py @@ -70,10 +70,10 @@ log.setup(CONF, 'api', # Initialize Swift driver Swift = get_driver(Provider.OPENSTACK_SWIFT) driver = Swift( - 'CloudComp2', - 'demo', + os.getenv("APPCRED_ID"), + os.getenv("APPCRED_SECRET"), ex_force_auth_url='https://10.32.4.29:5000/', - ex_force_auth_version='3.x_password', + ex_force_auth_version='3.x_appcred', ex_tenant_name='CloudComp2', ex_domain_name='default', )