openstack/api-site
Code Issues Proposed changes

Update for OpenDev

Browse Source 
Update URLs for recent OpenDev change.

Change-Id: I0f7e48f054da0eeb12593c5756e5f5f47a577f4f
This commit is contained in:
Andreas Jaeger 2019-04-21 16:35:33 +02:00
parent aba8287430
commit 7a6da6a936
24 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -25,7 +25,7 @@ In addition to these documents, this repository contains:
* Writing your first OpenStack application tutorial (in progress): ``firstapp`` * Writing your first OpenStack application tutorial (in progress): ``firstapp``
To complete code reviews in this repository, use the standard To complete code reviews in this repository, use the standard
OpenStack Gerrit `workflow <https://review.openstack.org>`_. OpenStack Gerrit `workflow <https://review.opendev.org>`_.
For details, see `Gerrit Workflow For details, see `Gerrit Workflow
<https://docs.openstack.org/infra/manual/developers.html#development-workflow>`_. <https://docs.openstack.org/infra/manual/developers.html#development-workflow>`_.
@ -91,7 +91,7 @@ To run individual tests:
To run these tests, the Tox package uses the To run these tests, the Tox package uses the
`OpenStack doc tools package `OpenStack doc tools package
<https://git.openstack.org/cgit/openstack/openstack-doc-tools>`_. <https://opendev.org/openstack/openstack-doc-tools>`_.
Contribute Contribute
========== ==========

2
firstapp/README.rst
View File

@ -6,7 +6,7 @@ This directory contains the "Writing Your First OpenStack Application"
tutorial. tutorial.
The tutorials work with an application that can be found in the The tutorials work with an application that can be found in the
`openstack/faafo <https://git.openstack.org/cgit/openstack/faafo>`_ `openstack/faafo <https://opendev.org/openstack/faafo>`_
repository. repository.
Prerequisites Prerequisites

2
firstapp/samples/fog/getting_started.rb
View File

@ -89,7 +89,7 @@ p conn.security_groups.all
# step-11 # step-11
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
END END

8
firstapp/samples/fog/introduction.rb
View File

@ -1,7 +1,7 @@
# step-1 # step-1
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
END END
@ -18,7 +18,7 @@ testing_instance.wait_for { ready? }
# step-2 # step-2
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -r worker -r demo -i messaging -i faafo -r api -r worker -r demo
END END
@ -88,7 +88,7 @@ conn.security_group_rules.create parent_group_id: controller_group.id,
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -i messaging -i faafo -r api
END END
@ -117,7 +117,7 @@ ip_controller = instance_controller_1.private_ip_address || instance_con
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r worker -e "http://#{ip_controller}" -m "amqp://guest:guest@#{ip_controller}:5672/" -i faafo -r worker -e "http://#{ip_controller}" -m "amqp://guest:guest@#{ip_controller}:5672/"
END END

6
firstapp/samples/fog/scaling_out.rb
View File

@ -86,7 +86,7 @@ end
# step-4 # step-4
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i database -i messaging -i database -i messaging
END END
@ -103,7 +103,7 @@ services_ip_address = instance_services.private_ip_address
# step-5 # step-5
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r api -m "amqp://guest:guest@#{services_ip_address}:5672/" -d "mysql+pymysql://faafo:password@#{services_ip_address}:3306/faafo" -i faafo -r api -m "amqp://guest:guest@#{services_ip_address}:5672/" -d "mysql+pymysql://faafo:password@#{services_ip_address}:3306/faafo"
END END
@ -135,7 +135,7 @@ end
# step-6 # step-6
user_data = <<END user_data = <<END
#!/usr/bin/env bash #!/usr/bin/env bash
curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \ curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r worker -e "http://#{api_1_ip_address}" -m "amqp://guest:guest@#{services_ip_address}:5672/" -i faafo -r worker -e "http://#{api_1_ip_address}" -m "amqp://guest:guest@#{services_ip_address}:5672/"
END END

2
firstapp/samples/gophercloud/block_storage.go
View File

@ -86,7 +86,7 @@ func main() {
}).Extract() }).Extract()
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo` -i faafo -i messaging -r api -r worker -r demo`
imageID := "41ba40fd-e801-4639-a842-e3a2e5a2ebdd" imageID := "41ba40fd-e801-4639-a842-e3a2e5a2ebdd"

2
firstapp/samples/gophercloud/getting_started.go
View File

@ -164,7 +164,7 @@ func main() {
// step-11 // step-11
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo` -i faafo -i messaging -r api -r worker -r demo`
// step-12 // step-12

2
firstapp/samples/heat/faafo_autoscaling_workers.yaml
View File

@ -38,7 +38,7 @@ parameters:
type: string type: string
description: The location of the faafo application install script on the Internet description: The location of the faafo application install script on the Internet
# allows you to clone and play with the faafo code if you like # allows you to clone and play with the faafo code if you like
default: https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh default: https://opendev.org/openstack/faafo/raw/contrib/install.sh
resources: resources:

2
firstapp/samples/heat/hello_faafo.yaml
View File

@ -32,7 +32,7 @@ parameters:
faafo_source: faafo_source:
type: string type: string
description: The http location of the faafo application install script description: The http location of the faafo application install script
default: https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh default: https://opendev.org/openstack/faafo/raw/contrib/install.sh
resources: resources:

2
firstapp/samples/jclouds/GettingStarted.java
View File

@ -178,7 +178,7 @@ class GettingStarted {
// # step-11 // # step-11
String ex_userdata = "#!/usr/bin/env bash\n" + String ex_userdata = "#!/usr/bin/env bash\n" +
" curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \\\n" + " curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \\\n" +
" -i faafo -i messaging -r api -r worker -r demo\n"; " -i faafo -i messaging -r api -r worker -r demo\n";
// # step-12 // # step-12

6
firstapp/samples/jclouds/Introduction.java
View File

@ -188,7 +188,7 @@ public class Introduction implements Closeable {
// step-2 // step-2
final String ex_userdata = "#!/usr/bin/env bash\n" + final String ex_userdata = "#!/usr/bin/env bash\n" +
" curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh" + " curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh" +
" | bash -s -- \\\n" + " | bash -s -- \\\n" +
" -i faafo -i messaging -r api -r worker -r demo\n"; " -i faafo -i messaging -r api -r worker -r demo\n";
// step-2-end // step-2-end
@ -355,7 +355,7 @@ public class Introduction implements Closeable {
private String createApiInstance() { private String createApiInstance() {
String userData = "#!/usr/bin/env bash\n" + String userData = "#!/usr/bin/env bash\n" +
"curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh" +
" | bash -s -- \\\n" + " | bash -s -- \\\n" +
" -i messaging -i faafo -r api\n"; " -i messaging -i faafo -r api\n";
String instanceName = "app-controller"; String instanceName = "app-controller";
@ -370,7 +370,7 @@ public class Introduction implements Closeable {
// step-12 // step-12
private String createWorkerInstance(String apiAccessIP) { private String createWorkerInstance(String apiAccessIP) {
String userData = "#!/usr/bin/env bash\n" + String userData = "#!/usr/bin/env bash\n" +
"curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh" +
" | bash -s -- \\\n" + " | bash -s -- \\\n" +
" -i faafo -r worker -e 'http://%1$s' -m 'amqp://guest:guest@%1$s:5672/'"; " -i faafo -r worker -e 'http://%1$s' -m 'amqp://guest:guest@%1$s:5672/'";
userData = String.format(userData, apiAccessIP); userData = String.format(userData, apiAccessIP);

6
firstapp/samples/jclouds/ScalingOut.java
View File

@ -189,7 +189,7 @@ public class ScalingOut implements Closeable {
*/ */
private String createAppServicesInstance() { private String createAppServicesInstance() {
String userData = "#!/usr/bin/env bash\n" + String userData = "#!/usr/bin/env bash\n" +
"curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \\\n" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \\\n" +
"-i database -i messaging\n"; "-i database -i messaging\n";
CreateServerOptions options = CreateServerOptions.Builder CreateServerOptions options = CreateServerOptions.Builder
.keyPairName(KEY_PAIR_NAME) .keyPairName(KEY_PAIR_NAME)
@ -205,7 +205,7 @@ public class ScalingOut implements Closeable {
*/ */
private String createApiInstance(String name, String servicesIp) { private String createApiInstance(String name, String servicesIp) {
String userData = String.format("#!/usr/bin/env bash\n" + String userData = String.format("#!/usr/bin/env bash\n" +
"curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \\\n" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \\\n" +
" -i faafo -r api -m 'amqp://guest:guest@%1$s:5672/' \\\n" + " -i faafo -r api -m 'amqp://guest:guest@%1$s:5672/' \\\n" +
" -d 'mysql+pymysql://faafo:password@%1$s:3306/faafo'", servicesIp); " -d 'mysql+pymysql://faafo:password@%1$s:3306/faafo'", servicesIp);
CreateServerOptions options = CreateServerOptions.Builder CreateServerOptions options = CreateServerOptions.Builder
@ -232,7 +232,7 @@ public class ScalingOut implements Closeable {
*/ */
private String createWorkerInstance(String name, String apiIp, String servicesIp) { private String createWorkerInstance(String name, String apiIp, String servicesIp) {
String userData = String.format("#!/usr/bin/env bash\n" + String userData = String.format("#!/usr/bin/env bash\n" +
"curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \\\n" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \\\n" +
" -i faafo -r worker -e 'http://%s' -m 'amqp://guest:guest@%s:5672/'", " -i faafo -r worker -e 'http://%s' -m 'amqp://guest:guest@%s:5672/'",
apiIp, servicesIp); apiIp, servicesIp);
CreateServerOptions options = CreateServerOptions.Builder CreateServerOptions options = CreateServerOptions.Builder

2
firstapp/samples/libcloud/getting_started.py
View File

@ -88,7 +88,7 @@ for security_group in conn.ex_list_security_groups():
# step-11 # step-11
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''

8
firstapp/samples/libcloud/introduction.py
View File

@ -1,6 +1,6 @@
# step-1 # step-1
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
@ -14,7 +14,7 @@ testing_instance = conn.create_node(name=instance_name,
# step-2 # step-2
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -r worker -r demo -i messaging -i faafo -r api -r worker -r demo
''' '''
@ -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) conn.ex_create_security_group_rule(controller_group, 'TCP', 5672, 5672, source_security_group=worker_group)
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -i messaging -i faafo -r api
''' '''
@ -97,7 +97,7 @@ else:
ip_controller = instance_controller_1.public_ips[0] ip_controller = instance_controller_1.public_ips[0]
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' -i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/'
''' % {'ip_controller': ip_controller} ''' % {'ip_controller': ip_controller}
instance_worker_1 = conn.create_node(name='app-worker-1', instance_worker_1 = conn.create_node(name='app-worker-1',

6
firstapp/samples/libcloud/scaling_out.py
View File

@ -44,7 +44,7 @@ def get_floating_ip(conn):
# step-4 # step-4
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i database -i messaging -i database -i messaging
''' '''
@ -60,7 +60,7 @@ services_ip = instance_services.private_ips[0]
# step-5 # step-5
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://opendev.org/openstack/faafo/raw/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'
''' % { 'services_ip': services_ip } ''' % { 'services_ip': services_ip }
@ -88,7 +88,7 @@ for instance in [instance_api_1, instance_api_2]:
# step-6 # step-6
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://opendev.org/openstack/faafo/raw/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}
instance_worker_1 = conn.create_node(name='app-worker-1', instance_worker_1 = conn.create_node(name='app-worker-1',

2
firstapp/samples/openstacksdk/getting_started.py
View File

@ -114,7 +114,7 @@ for security_group in conn.network.security_groups():
# step-11 # step-11
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
userdata_b64str = base64.b64encode(userdata) userdata_b64str = base64.b64encode(userdata)

8
firstapp/samples/openstacksdk/introduction.py
View File

@ -1,6 +1,6 @@
# step-1 # step-1
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
userdata_b64str = base64.b64encode(userdata) userdata_b64str = base64.b64encode(userdata)
@ -19,7 +19,7 @@ testing_instance = conn.compute.create_server(**testing_instance_args)
# step-2 # step-2
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
userdata_b64str = base64.b64encode(userdata) userdata_b64str = base64.b64encode(userdata)
@ -120,7 +120,7 @@ security_rule_args['remote_group_id'] = worker_group
conn.network.create_security_group_rule(**security_rule_args) conn.network.create_security_group_rule(**security_rule_args)
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -i messaging -i faafo -r api
''' '''
userdata_b64str = base64.b64encode(userdata) userdata_b64str = base64.b64encode(userdata)
@ -172,7 +172,7 @@ for values in instance_controller_1.addresses.values():
break break
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' -i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/'
''' % {'ip_controller': ip_controller} ''' % {'ip_controller': ip_controller}
userdata_b64str = base64.b64encode(userdata) userdata_b64str = base64.b64encode(userdata)

2
firstapp/samples/pkgcloud/getting_started.js
View File

@ -140,7 +140,7 @@ if (security_group_exists) {
// step-11 // step-11
userdata = "#!/usr/bin/env bash\n" + userdata = "#!/usr/bin/env bash\n" +
"curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh" + "curl -L -s https://opendev.org/openstack/faafo/raw/contrib/install.sh" +
" | bash -s -- -i faafo -i messaging -r api -r worker -r demo"; " | bash -s -- -i faafo -i messaging -r api -r worker -r demo";
userdata = new Buffer(userdata).toString('base64') userdata = new Buffer(userdata).toString('base64')

2
firstapp/samples/shade/block_storage.py
View File

@ -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') conn.create_security_group_rule(db_group['name'], 3306, 3306, 'TCP')
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i database -i messaging -i database -i messaging
''' '''

2
firstapp/samples/shade/getting_started.py
View File

@ -70,7 +70,7 @@ conn.search_security_groups(sec_group_name)
#step-11 #step-11
ex_userdata = '''#!/usr/bin/env bash ex_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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''

8
firstapp/samples/shade/introduction.py
View File

@ -1,7 +1,7 @@
# step-1 # step-1
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
@ -17,7 +17,7 @@ testing_instance = conn.create_server(wait=True, auto_ip=False,
# step-2 # step-2
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -i messaging -r api -r worker -r demo -i faafo -i messaging -r api -r worker -r demo
''' '''
@ -66,7 +66,7 @@ else:
conn.create_security_group_rule(controller_group['name'], 5672, 5672, 'TCP', remote_group_id=worker_group['id']) conn.create_security_group_rule(controller_group['name'], 5672, 5672, 'TCP', remote_group_id=worker_group['id'])
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i messaging -i faafo -r api -i messaging -i faafo -r api
''' '''
@ -92,7 +92,7 @@ else:
ip_controller = conn.get_server_private_ip(instance_controller_1) ip_controller = conn.get_server_private_ip(instance_controller_1)
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/' -i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/'
''' % {'ip_controller': ip_controller} ''' % {'ip_controller': ip_controller}

6
firstapp/samples/shade/scaling_out.py
View File

@ -30,7 +30,7 @@ def get_floating_ip(conn):
# step-4 # step-4
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://opendev.org/openstack/faafo/raw/contrib/install.sh | bash -s -- \
-i database -i messaging -i database -i messaging
''' '''
@ -46,7 +46,7 @@ services_ip = conn.get_server_private_ip(instance_services)
# step-5 # step-5
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://opendev.org/openstack/faafo/raw/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'
''' % { 'services_ip': services_ip } ''' % { 'services_ip': services_ip }
@ -76,7 +76,7 @@ for instance in [instance_api_1, instance_api_2]:
# step-6 # step-6
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://opendev.org/openstack/faafo/raw/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}

4
firstapp/source/getting_started.rst
View File

@ -355,7 +355,7 @@ to run code snippets in your language of choice.
:language: yaml :language: yaml
.. note:: If you do use a public cloud `known by shade .. note:: If you do use a public cloud `known by shade
<https://git.openstack.org/cgit/openstack/os-client-config/tree/os_client_config/vendors>`_, <https://opendev.org/openstack/os-client-config/src/os_client_config/vendors>`_,
you can avoid specifying :code:`auth_url:` and instead specify you can avoid specifying :code:`auth_url:` and instead specify
:code:`profile: $PROVIDER_NAME` in the clouds.yml file. :code:`profile: $PROVIDER_NAME` in the clouds.yml file.
@ -366,7 +366,7 @@ to run code snippets in your language of choice.
.. literalinclude:: ../samples/shade/shade.yml .. literalinclude:: ../samples/shade/shade.yml
:language: yaml :language: yaml
See `configure shade <https://git.openstack.org/cgit/openstack/os-client-config/tree/README.rst>`_, See `configure shade <https://opendev.org/openstack/os-client-config/src/README.rst>`_,
to configure your cloud using a profile. to configure your cloud using a profile.
.. literalinclude:: ../samples/shade/getting_started.py .. literalinclude:: ../samples/shade/getting_started.py

6
firstapp/source/orchestration.rst
View File

@ -96,7 +96,7 @@ Work with stacks: Basics
**Stack create** **Stack create**
The The
`hello_faafo <https://git.openstack.org/cgit/openstack/api-site/plain/firstapp/samples/heat/hello_faafo.yaml>`_ Hot template demonstrates `hello_faafo <https://opendev.org/openstack/api-site/raw/firstapp/samples/heat/hello_faafo.yaml>`_ Hot template demonstrates
how to create a compute instance that builds and runs the Fractal application how to create a compute instance that builds and runs the Fractal application
as an all-in-one installation. as an all-in-one installation.
@ -108,7 +108,7 @@ You pass in these configuration settings as parameters:
.. code-block:: console .. code-block:: console
$ wget https://git.openstack.org/cgit/openstack/api-site/plain/firstapp/samples/heat/hello_faafo.yaml $ wget https://opendev.org/openstack/api-site/raw/firstapp/samples/heat/hello_faafo.yaml
$ openstack stack create -t hello_faafo.yaml \ $ openstack stack create -t hello_faafo.yaml \
--parameter flavor=m1.small\;key_name=test\;image_id=5bbe4073-90c0-4ec9-833c-092459cc4539 hello_faafo --parameter flavor=m1.small\;key_name=test\;image_id=5bbe4073-90c0-4ec9-833c-092459cc4539 hello_faafo
+---------------------+-----------------------------------------------------------------------+ +---------------------+-----------------------------------------------------------------------+
@ -245,7 +245,7 @@ Launch the stack with auto-scaling workers:
.. code-block:: console .. code-block:: console
$ wget https://git.openstack.org/cgit/openstack/api-site/plain/firstapp/samples/heat/faafo_autoscaling_workers.yaml $ wget https://opendev.org/openstack/api-site/raw/firstapp/samples/heat/faafo_autoscaling_workers.yaml
$ openstack stack create -t faafo_autoscaling_workers.yaml \ $ openstack stack create -t faafo_autoscaling_workers.yaml \
--parameters flavor=m1.small\;key_name=test\;image_id=5bbe4073-90c0-4ec9-833c-092459cc4539 \ --parameters flavor=m1.small\;key_name=test\;image_id=5bbe4073-90c0-4ec9-833c-092459cc4539 \
faafo_autoscaling_workers faafo_autoscaling_workers