diff --git a/firstapp/samples/fog/getting_started.rb b/firstapp/samples/fog/getting_started.rb index 6edaae0c1..d75307251 100755 --- a/firstapp/samples/fog/getting_started.rb +++ b/firstapp/samples/fog/getting_started.rb @@ -99,7 +99,7 @@ end # step-11 userdata = "#!/usr/bin/env bash -curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh \ +curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh \ | bash -s -- \ -i faafo -i messaging -r api -r worker -r demo" # step-12 diff --git a/firstapp/samples/shade/introduction.py b/firstapp/samples/shade/introduction.py index c21838b55..1ba0ed17c 100644 --- a/firstapp/samples/shade/introduction.py +++ b/firstapp/samples/shade/introduction.py @@ -1,7 +1,7 @@ # step-1 userdata = '''#!/usr/bin/env bash -curl -L -s https://git.openstack.org/cgit/stackforge/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 -i messaging -r api -r worker -r demo ''' @@ -15,7 +15,7 @@ testing_instance = conn.create_server(wait=True, auto_ip=False, # step-2 userdata = '''#!/usr/bin/env bash -curl -L -s https://git.openstack.org/cgit/stackforge/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 -i messaging -r api -r worker -r demo ''' @@ -56,7 +56,7 @@ conn.create_security_group_rule(controller_group['name'], 80, 80, 'TCP') conn.create_security_group_rule(controller_group['name'], 5672, 5672, 'TCP', remote_group_id=worker_group['id']) userdata = '''#!/usr/bin/env bash -curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \ +curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ -i messaging -i faafo -r api ''' @@ -82,7 +82,7 @@ else: ip_controller = conn.get_server_private_ip(instance_controller_1) userdata = '''#!/usr/bin/env bash -curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \ +curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ -i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' ''' % {'ip_controller': ip_controller} diff --git a/firstapp/samples/shade/scaling_out.py b/firstapp/samples/shade/scaling_out.py index a02b42e90..63a6df497 100644 --- a/firstapp/samples/shade/scaling_out.py +++ b/firstapp/samples/shade/scaling_out.py @@ -30,7 +30,7 @@ def get_floating_ip(conn): # step-4 userdata = '''#!/usr/bin/env bash -curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \ +curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ -i database -i messaging ''' @@ -46,7 +46,7 @@ services_ip = conn.get_server_private_ip(instance_services) # step-5 userdata = '''#!/usr/bin/env bash -curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \ +curl -L -s http://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' ''' % { 'services_ip': services_ip } @@ -76,7 +76,7 @@ for instance in [instance_api_1, instance_api_2]: # step-6 userdata = '''#!/usr/bin/env bash -curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \ +curl -L -s http://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}