From b57045ecf79cf2b30a32ecea641529795bc62315 Mon Sep 17 00:00:00 2001 From: Sebastian Rieger Date: Mon, 18 Apr 2022 22:53:14 +0200 Subject: [PATCH] * changed password in demo1 to be provided in source, not safe, but easy start and private cloud endpoints are not externally reachable anyway * added missing network definition in demo3-microservice * fixed typo in demo4-scale-out-add-worker * renamed demo4 destroy to destroy-all-demo-instances.py to serve as universal cleanup script for the provided faafo demos --- demo1-getting-started.py | 4 ++-- demo3-microservice.py | 1 + demo4-scale-out-add-worker.py | 2 +- demo4-scale-out-destroy.py => destroy-all-demo-instances.py | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename demo4-scale-out-destroy.py => destroy-all-demo-instances.py (100%) diff --git a/demo1-getting-started.py b/demo1-getting-started.py index 7cd4647..1a872c6 100644 --- a/demo1-getting-started.py +++ b/demo1-getting-started.py @@ -42,8 +42,8 @@ domain_name = "default" def main(): # get the password from user - auth_password = getpass.getpass("Enter your OpenStack password:") - # auth_password = "demo" + # auth_password = getpass.getpass("Enter your OpenStack password:") + auth_password = "demo" # instantiate a connection to the OpenStack private cloud # make sure to include ex_domain_name and ex_force_auth_version='3.x_password', as they are needed in our diff --git a/demo3-microservice.py b/demo3-microservice.py index 34f9909..68b4300 100644 --- a/demo3-microservice.py +++ b/demo3-microservice.py @@ -238,6 +238,7 @@ def main(): instance_worker_1 = conn.create_node(name='app-worker-1', image=image, size=flavor, + networks=[network], ex_keyname=keypair_name, ex_userdata=userdata, ex_security_groups=[worker_security_group]) diff --git a/demo4-scale-out-add-worker.py b/demo4-scale-out-add-worker.py index 5f672af..95af385 100644 --- a/demo4-scale-out-add-worker.py +++ b/demo4-scale-out-add-worker.py @@ -101,7 +101,7 @@ def main(): ########################################################################### # - # get fixed a ip for serivice and api instance + # get fixed a ip for service and api instance # (better would be shared IP for the cluster etc.) # ########################################################################### diff --git a/demo4-scale-out-destroy.py b/destroy-all-demo-instances.py similarity index 100% rename from demo4-scale-out-destroy.py rename to destroy-all-demo-instances.py