moved start of worker-3, changed var names to reflect their usage

This commit is contained in:
Sebastian Rieger
2019-05-13 12:47:29 +02:00
parent e3cb9ba108
commit f8751eb327
3 changed files with 120 additions and 19 deletions

View File

@ -25,6 +25,7 @@ region_name = 'RegionOne'
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'
@ -220,7 +221,7 @@ def main():
#
# Thanks to Stefan Friedmann for finding this fix ;)
userdata = '''#!/usr/bin/env bash
userdata_service = '''#!/usr/bin/env bash
curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
-i database -i messaging
rabbitmqctl add_user faafo guest
@ -234,7 +235,7 @@ def main():
size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_service,
ex_security_groups=[services_security_group])
instance_services = conn.wait_until_running(nodes=[instance_services], timeout=120,
ssh_interface='private_ips')[0][0]
@ -246,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 -- \
-i faafo -r api -m 'amqp://guest:guest@%(services_ip)s:5672/' \
-d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo'
@ -258,7 +259,7 @@ def main():
size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_api,
ex_security_groups=[api_security_group])
print('Starting new app-api-2 instance and wait until it is running...')
@ -267,7 +268,7 @@ def main():
size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata,
ex_userdata=userdata_api,
ex_security_groups=[api_security_group])
instance_api_1 = conn.wait_until_running(nodes=[instance_api_1], timeout=120,
@ -288,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 -- \
-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
# userdata_api-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}
@ -303,28 +304,30 @@ def main():
image=image, size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata_api_1,
ex_userdata=userdata_worker,
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',
image=image, size=flavor,
networks=[network],
ex_keyname=keypair_name,
ex_userdata=userdata_api_1,
ex_userdata=userdata_worker,
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_2)
print(instance_worker_3)
#print(instance_worker_3)
if __name__ == '__main__':