From a9348c2bd46e17c492ee1d44db2fcb28bec72f83 Mon Sep 17 00:00:00 2001 From: yanghc Date: Thu, 13 Jul 2017 15:24:13 +0800 Subject: [PATCH] Use https instead of http Change-Id: Ic85883c4d0458e9e81d6d8c9d11ad248afd19d4f Signed-off-by: yanghc --- firstapp/samples/libcloud/introduction.py | 4 ++-- firstapp/samples/libcloud/scaling_out.py | 6 +++--- firstapp/samples/openstacksdk/introduction.py | 4 ++-- firstapp/samples/shade/block_storage.py | 2 +- firstapp/samples/shade/introduction.py | 4 ++-- firstapp/samples/shade/scaling_out.py | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/firstapp/samples/libcloud/introduction.py b/firstapp/samples/libcloud/introduction.py index 62d7d8c71..0982c78ab 100644 --- a/firstapp/samples/libcloud/introduction.py +++ b/firstapp/samples/libcloud/introduction.py @@ -60,7 +60,7 @@ conn.ex_create_security_group_rule(controller_group, 'TCP', 80, 80) conn.ex_create_security_group_rule(controller_group, 'TCP', 5672, 5672, source_security_group=worker_group) userdata = '''#!/usr/bin/env bash -curl -L -s http://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 ''' @@ -97,7 +97,7 @@ else: ip_controller = instance_controller_1.public_ips[0] userdata = '''#!/usr/bin/env bash -curl -L -s http://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://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' ''' % {'ip_controller': ip_controller} instance_worker_1 = conn.create_node(name='app-worker-1', diff --git a/firstapp/samples/libcloud/scaling_out.py b/firstapp/samples/libcloud/scaling_out.py index 708c8f57f..8b1c79126 100644 --- a/firstapp/samples/libcloud/scaling_out.py +++ b/firstapp/samples/libcloud/scaling_out.py @@ -44,7 +44,7 @@ def get_floating_ip(conn): # step-4 userdata = '''#!/usr/bin/env bash -curl -L -s http://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 ''' @@ -60,7 +60,7 @@ services_ip = instance_services.private_ips[0] # step-5 userdata = '''#!/usr/bin/env bash -curl -L -s http://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/' \ -d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo' ''' % { 'services_ip': services_ip } @@ -88,7 +88,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/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/' ''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip} instance_worker_1 = conn.create_node(name='app-worker-1', diff --git a/firstapp/samples/openstacksdk/introduction.py b/firstapp/samples/openstacksdk/introduction.py index 67aebfe02..10a63ca20 100644 --- a/firstapp/samples/openstacksdk/introduction.py +++ b/firstapp/samples/openstacksdk/introduction.py @@ -120,7 +120,7 @@ security_rule_args['remote_group_id'] = worker_group conn.network.create_security_group_rule(**security_rule_args) userdata = '''#!/usr/bin/env bash -curl -L -s http://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 ''' userdata_b64str = base64.b64encode(userdata) @@ -172,7 +172,7 @@ for values in instance_controller_1.addresses.itervalues(): break userdata = '''#!/usr/bin/env bash -curl -L -s http://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://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' ''' % {'ip_controller': ip_controller} userdata_b64str = base64.b64encode(userdata) diff --git a/firstapp/samples/shade/block_storage.py b/firstapp/samples/shade/block_storage.py index 362cf2e0e..ff166fcc7 100644 --- a/firstapp/samples/shade/block_storage.py +++ b/firstapp/samples/shade/block_storage.py @@ -17,7 +17,7 @@ conn.create_security_group_rule(db_group['name'], 22, 22, 'TCP') conn.create_security_group_rule(db_group['name'], 3306, 3306, 'TCP') userdata = '''#!/usr/bin/env bash -curl -L -s http://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 ''' diff --git a/firstapp/samples/shade/introduction.py b/firstapp/samples/shade/introduction.py index 7eb211746..18dc68b87 100644 --- a/firstapp/samples/shade/introduction.py +++ b/firstapp/samples/shade/introduction.py @@ -66,7 +66,7 @@ else: 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/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 ''' @@ -92,7 +92,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/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://%(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 bc0c25cda..5a3f84d26 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/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 ''' @@ -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/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/' \ -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/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/' ''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}