Browse Source

Merge remote-tracking branch 'origin/master'

pull/3/head
Sebastian Rieger 5 years ago
parent
commit
7ff3cd8b44
  1. BIN
      aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png
  2. 11
      demo3-microservice.py
  3. 179
      demo4-scale-out-add-worker.py
  4. 4
      demo4-scale-out-destroy.py
  5. 48
      demo4-scale-out.py

BIN
aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png

Before

Width: 2163  |  Height: 2163  |  Size: 316 KiB

After

Width: 2046  |  Height: 2046  |  Size: 299 KiB

11
demo3-microservice.py

@ -23,6 +23,7 @@ region_name = 'RegionOne'
domain_name = "default" domain_name = "default"
ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image" ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image"
#ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
flavor_name = 'm1.small' flavor_name = 'm1.small'
@ -153,11 +154,21 @@ def main():
# #
########################################################################### ###########################################################################
# 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 ;)
userdata = '''#!/usr/bin/env bash userdata = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -i messaging -i faafo -r api
rabbitmqctl add_user faafo guest
rabbitmqctl set_user_tags faafo administrator
rabbitmqctl set_permissions -p / faafo ".*" ".*" ".*"
''' '''
print('Starting new app-controller instance and wait until it is running...') print('Starting new app-controller instance and wait until it is running...')
instance_controller_1 = conn.create_node(name='app-controller', instance_controller_1 = conn.create_node(name='app-controller',
image=image, image=image,

179
demo4-scale-out-add-worker.py

@ -0,0 +1,179 @@
# import getpass
# import os
# import libcloud.security
import time
from libcloud.compute.providers import get_driver
from libcloud.compute.types import Provider
# reqs:
# services: nova, glance, neutron
# resources: 2 instances (m1.small), 2 floating ips (1 keypair, 2 security groups)
# Please use 1-25 for X in username, project etc., as coordinated in the lab sessions
# web service endpoint of the private cloud infrastructure
auth_url = 'https://private-cloud2.informatik.hs-fulda.de:5000'
# your username in OpenStack
auth_username = 'CloudCompX'
# your project in OpenStack
project_name = 'CloudCompGrpX'
# default region
region_name = 'RegionOne'
# domain to use, "default" for local accounts, "hsfulda" for LDAP of DVZ, e.g., using fdaiXXXX as auth_username
domain_name = "default"
ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image"
#ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
flavor_name = 'm1.small'
network_name = "CloudCompGrpX-net"
keypair_name = 'srieger-pub'
pub_key_file = '~/.ssh/id_rsa.pub'
def main():
###########################################################################
#
# get credentials
#
###########################################################################
# if "OS_PASSWORD" in os.environ:
# auth_password = os.environ["OS_PASSWORD"]
# else:
# auth_password = getpass.getpass("Enter your OpenStack password:")
auth_password = "demo"
###########################################################################
#
# create connection
#
###########################################################################
# libcloud.security.VERIFY_SSL_CERT = False
provider = get_driver(Provider.OPENSTACK)
conn = provider(auth_username,
auth_password,
ex_force_auth_url=auth_url,
ex_force_auth_version='3.x_password',
ex_tenant_name=project_name,
ex_force_service_region=region_name,
ex_domain_name=domain_name)
###########################################################################
#
# get image, flavor, network for instance creation
#
###########################################################################
images = conn.list_images()
image = ''
for img in images:
if img.name == ubuntu_image_name:
image = img
flavors = conn.list_sizes()
flavor = ''
for flav in flavors:
if flav.name == flavor_name:
flavor = conn.ex_get_size(flav.id)
networks = conn.ex_list_networks()
network = ''
for net in networks:
if net.name == network_name:
network = net
###########################################################################
#
# get fixed a ip for serivice and api instance
# (better would be shared IP for the cluster etc.)
#
###########################################################################
# find service instance
for instance in conn.list_nodes():
if instance.name == 'app-services':
services_ip = instance.private_ips[0]
print('Found app-services fixed IP to be: ', services_ip)
if instance.name == 'app-api-1':
api_1_ip = instance.private_ips[0]
print('Found app-api-1 fixed IP to be: ', api_1_ip)
###########################################################################
#
# create keypair dependency
#
###########################################################################
print('Checking for existing SSH key pair...')
keypair_exists = False
for keypair in conn.list_key_pairs():
if keypair.name == keypair_name:
keypair_exists = True
if keypair_exists:
print('Keypair ' + keypair_name + ' already exists. Skipping import.')
else:
print('adding keypair...')
conn.import_key_pair_from_file(keypair_name, pub_key_file)
for keypair in conn.list_key_pairs():
print(keypair)
###########################################################################
#
# create security group dependency
#
###########################################################################
def get_security_group(connection, security_group_name):
"""A helper function to check if security group already exists"""
print('Checking for existing ' + security_group_name + ' security group...')
for security_grp in connection.ex_list_security_groups():
if security_grp.name == security_group_name:
print('Security Group ' + security_group_name + ' already exists. Skipping creation.')
return security_grp
return False
if not get_security_group(conn, "worker"):
worker_security_group = conn.ex_create_security_group('worker', 'for services that run on a worker node')
conn.ex_create_security_group_rule(worker_security_group, 'TCP', 22, 22)
else:
worker_security_group = get_security_group(conn, "worker")
for security_group in conn.ex_list_security_groups():
print(security_group)
###########################################################################
#
# create worker instances
#
###########################################################################
userdata_worker = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i faafo -r worker -e 'http://%(api_1_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/'
''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}
# userdata-api-2 = '''#!/usr/bin/env bash
# curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
# -i faafo -r worker -e 'http://%(api_2_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/'
# ''' % {'api_2_ip': api_2_ip, 'services_ip': services_ip}
print('Starting new app-worker-3 instance and wait until it is running...')
instance_worker_3 = conn.create_node(name='app-worker-3',
image=image, size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata_worker,
ex_security_groups=[worker_security_group])
if __name__ == '__main__':
main()

4
demo4-scale-out-destroy.py

@ -25,6 +25,7 @@ region_name = 'RegionOne'
domain_name = "default" domain_name = "default"
ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image" ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image"
#ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
flavor_name = 'm1.small' flavor_name = 'm1.small'
@ -85,7 +86,8 @@ def main():
instances = conn.list_nodes() instances = conn.list_nodes()
for instance in instances: for instance in instances:
# if we see any demo instances still running continue to wait for them to stop # if we see any demo instances still running continue to wait for them to stop
if instance.name in ['all-in-one', 'app-worker-1', 'app-worker-2', 'app-controller']:
if instance.name in ['all-in-one', 'app-worker-1', 'app-worker-2', 'app-worker-3', 'app-controller',
'app-services', 'app-api-1', 'app-api-2']:
nodes_still_running = True nodes_still_running = True
print('There are still instances running, waiting for them to be destroyed...') print('There are still instances running, waiting for them to be destroyed...')

48
demo4-scale-out.py

@ -25,6 +25,7 @@ region_name = 'RegionOne'
domain_name = "default" domain_name = "default"
ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image" ubuntu_image_name = "Ubuntu 14.04 - Trusty Tahr - 64-bit - Cloud Based Image"
#ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
flavor_name = 'm1.small' flavor_name = 'm1.small'
@ -214,9 +215,18 @@ def main():
# #
########################################################################### ###########################################################################
userdata = '''#!/usr/bin/env bash
# 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 ;)
userdata_service = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i database -i messaging -i database -i messaging
rabbitmqctl add_user faafo guest
rabbitmqctl set_user_tags faafo administrator
rabbitmqctl set_permissions -p / faafo ".*" ".*" ".*"
''' '''
print('Starting new app-services instance and wait until it is running...') print('Starting new app-services instance and wait until it is running...')
@ -225,7 +235,7 @@ def main():
size=flavor, size=flavor,
networks=[network], networks=[network],
ex_keyname=keypair_name, ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_service,
ex_security_groups=[services_security_group]) ex_security_groups=[services_security_group])
instance_services = conn.wait_until_running(nodes=[instance_services], timeout=120, instance_services = conn.wait_until_running(nodes=[instance_services], timeout=120,
ssh_interface='private_ips')[0][0] ssh_interface='private_ips')[0][0]
@ -237,7 +247,7 @@ def main():
# #
########################################################################### ###########################################################################
userdata = '''#!/usr/bin/env bash
userdata_api = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i faafo -r api -m 'amqp://guest:guest@%(services_ip)s:5672/' \ -i faafo -r api -m 'amqp://guest:guest@%(services_ip)s:5672/' \
-d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo' -d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo'
@ -249,7 +259,7 @@ def main():
size=flavor, size=flavor,
networks=[network], networks=[network],
ex_keyname=keypair_name, ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_api,
ex_security_groups=[api_security_group]) ex_security_groups=[api_security_group])
print('Starting new app-api-2 instance and wait until it is running...') print('Starting new app-api-2 instance and wait until it is running...')
@ -258,7 +268,7 @@ def main():
size=flavor, size=flavor,
networks=[network], networks=[network],
ex_keyname=keypair_name, ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_api,
ex_security_groups=[api_security_group]) ex_security_groups=[api_security_group])
instance_api_1 = conn.wait_until_running(nodes=[instance_api_1], timeout=120, instance_api_1 = conn.wait_until_running(nodes=[instance_api_1], timeout=120,
@ -279,12 +289,12 @@ def main():
# #
########################################################################### ###########################################################################
userdata_api_1 = '''#!/usr/bin/env bash
userdata_worker = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i faafo -r worker -e 'http://%(api_1_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/' -i faafo -r worker -e 'http://%(api_1_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/'
''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip} ''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}
# userdata-api-2 = '''#!/usr/bin/env bash
# userdata_api-api-2 = '''#!/usr/bin/env bash
# curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ # curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
# -i faafo -r worker -e 'http://%(api_2_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/' # -i faafo -r worker -e 'http://%(api_2_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/'
# ''' % {'api_2_ip': api_2_ip, 'services_ip': services_ip} # ''' % {'api_2_ip': api_2_ip, 'services_ip': services_ip}
@ -294,28 +304,30 @@ def main():
image=image, size=flavor, image=image, size=flavor,
networks=[network], networks=[network],
ex_keyname=keypair_name, ex_keyname=keypair_name,
ex_userdata=userdata_api_1,
ex_userdata=userdata_worker,
ex_security_groups=[worker_security_group]) ex_security_groups=[worker_security_group])
print('Starting new app-worker-1 instance and wait until it is running...')
print('Starting new app-worker-2 instance and wait until it is running...')
instance_worker_2 = conn.create_node(name='app-worker-2', instance_worker_2 = conn.create_node(name='app-worker-2',
image=image, size=flavor, image=image, size=flavor,
networks=[network], networks=[network],
ex_keyname=keypair_name, ex_keyname=keypair_name,
ex_userdata=userdata_api_1,
ex_userdata=userdata_worker,
ex_security_groups=[worker_security_group]) ex_security_groups=[worker_security_group])
print('Starting new app-worker-1 instance and wait until it is running...')
instance_worker_3 = conn.create_node(name='app-worker-3',
image=image, size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata_api_1,
ex_security_groups=[worker_security_group])
# do not start worker 3 initially, can be started using scale-out-add-worker.py demo
#print('Starting new app-worker-3 instance and wait until it is running...')
#instance_worker_3 = conn.create_node(name='app-worker-3',
# image=image, size=flavor,
# networks=[network],
# ex_keyname=keypair_name,
# ex_userdata=userdata_worker,
# ex_security_groups=[worker_security_group])
print(instance_worker_1) print(instance_worker_1)
print(instance_worker_2) print(instance_worker_2)
print(instance_worker_3)
#print(instance_worker_3)
if __name__ == '__main__': if __name__ == '__main__':

Loading…
Cancel
Save