* 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
This commit is contained in:
		@@ -42,8 +42,8 @@ domain_name = "default"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
def main():
 | 
					def main():
 | 
				
			||||||
    # get the password from user
 | 
					    # get the password from user
 | 
				
			||||||
    auth_password = getpass.getpass("Enter your OpenStack password:")
 | 
					    # auth_password = getpass.getpass("Enter your OpenStack password:")
 | 
				
			||||||
    # auth_password = "demo"
 | 
					    auth_password = "demo"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # instantiate a connection to the OpenStack private cloud
 | 
					    # 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
 | 
					    # make sure to include ex_domain_name and ex_force_auth_version='3.x_password', as they are needed in our
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -238,6 +238,7 @@ def main():
 | 
				
			|||||||
    instance_worker_1 = conn.create_node(name='app-worker-1',
 | 
					    instance_worker_1 = conn.create_node(name='app-worker-1',
 | 
				
			||||||
                                         image=image,
 | 
					                                         image=image,
 | 
				
			||||||
                                         size=flavor,
 | 
					                                         size=flavor,
 | 
				
			||||||
 | 
					                                         networks=[network],
 | 
				
			||||||
                                         ex_keyname=keypair_name,
 | 
					                                         ex_keyname=keypair_name,
 | 
				
			||||||
                                         ex_userdata=userdata,
 | 
					                                         ex_userdata=userdata,
 | 
				
			||||||
                                         ex_security_groups=[worker_security_group])
 | 
					                                         ex_security_groups=[worker_security_group])
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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.) 
 | 
					    # (better would be shared IP for the cluster etc.) 
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
    ###########################################################################
 | 
					    ###########################################################################
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user