From 7a6da6a936ea46f56555a1431e9c4d85cc37fd8d Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 21 Apr 2019 16:35:33 +0200
Subject: [PATCH] Update for OpenDev

Update URLs for recent OpenDev change.

Change-Id: I0f7e48f054da0eeb12593c5756e5f5f47a577f4f
---
 README.rst                                           | 4 ++--
 firstapp/README.rst                                  | 2 +-
 firstapp/samples/fog/getting_started.rb              | 2 +-
 firstapp/samples/fog/introduction.rb                 | 8 ++++----
 firstapp/samples/fog/scaling_out.rb                  | 6 +++---
 firstapp/samples/gophercloud/block_storage.go        | 2 +-
 firstapp/samples/gophercloud/getting_started.go      | 2 +-
 firstapp/samples/heat/faafo_autoscaling_workers.yaml | 2 +-
 firstapp/samples/heat/hello_faafo.yaml               | 2 +-
 firstapp/samples/jclouds/GettingStarted.java         | 2 +-
 firstapp/samples/jclouds/Introduction.java           | 6 +++---
 firstapp/samples/jclouds/ScalingOut.java             | 6 +++---
 firstapp/samples/libcloud/getting_started.py         | 2 +-
 firstapp/samples/libcloud/introduction.py            | 8 ++++----
 firstapp/samples/libcloud/scaling_out.py             | 6 +++---
 firstapp/samples/openstacksdk/getting_started.py     | 2 +-
 firstapp/samples/openstacksdk/introduction.py        | 8 ++++----
 firstapp/samples/pkgcloud/getting_started.js         | 2 +-
 firstapp/samples/shade/block_storage.py              | 2 +-
 firstapp/samples/shade/getting_started.py            | 2 +-
 firstapp/samples/shade/introduction.py               | 8 ++++----
 firstapp/samples/shade/scaling_out.py                | 6 +++---
 firstapp/source/getting_started.rst                  | 4 ++--
 firstapp/source/orchestration.rst                    | 6 +++---
 24 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/README.rst b/README.rst
index 7647b91bc..8cb609563 100644
--- a/README.rst
+++ b/README.rst
@@ -25,7 +25,7 @@ In addition to these documents, this repository contains:
  * Writing your first OpenStack application tutorial (in progress): ``firstapp``
 
 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
 <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
 `OpenStack doc tools package
-<https://git.openstack.org/cgit/openstack/openstack-doc-tools>`_.
+<https://opendev.org/openstack/openstack-doc-tools>`_.
 
 Contribute
 ==========
diff --git a/firstapp/README.rst b/firstapp/README.rst
index 0b9e2b660..2f5b824bf 100644
--- a/firstapp/README.rst
+++ b/firstapp/README.rst
@@ -6,7 +6,7 @@ This directory contains the "Writing Your First OpenStack Application"
 tutorial.
 
 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.
 
 Prerequisites
diff --git a/firstapp/samples/fog/getting_started.rb b/firstapp/samples/fog/getting_started.rb
index 894989080..b49f0aa9e 100755
--- a/firstapp/samples/fog/getting_started.rb
+++ b/firstapp/samples/fog/getting_started.rb
@@ -89,7 +89,7 @@ p conn.security_groups.all
 # step-11
 user_data = <<END
 #!/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
 END
 
diff --git a/firstapp/samples/fog/introduction.rb b/firstapp/samples/fog/introduction.rb
index ad39e67c2..8eea7d712 100644
--- a/firstapp/samples/fog/introduction.rb
+++ b/firstapp/samples/fog/introduction.rb
@@ -1,7 +1,7 @@
 # step-1
 user_data = <<END
 #!/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
 END
 
@@ -18,7 +18,7 @@ testing_instance.wait_for { ready? }
 # step-2
 user_data = <<END
 #!/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
 END
 
@@ -88,7 +88,7 @@ conn.security_group_rules.create parent_group_id: controller_group.id,
 
 user_data = <<END
 #!/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
 END
 
@@ -117,7 +117,7 @@ ip_controller         = instance_controller_1.private_ip_address || instance_con
 
 user_data = <<END
 #!/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/"
 END
 
diff --git a/firstapp/samples/fog/scaling_out.rb b/firstapp/samples/fog/scaling_out.rb
index 39bbeca0d..3c6bee275 100644
--- a/firstapp/samples/fog/scaling_out.rb
+++ b/firstapp/samples/fog/scaling_out.rb
@@ -86,7 +86,7 @@ end
 # step-4
 user_data = <<END
 #!/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
 END
 
@@ -103,7 +103,7 @@ services_ip_address = instance_services.private_ip_address
 # step-5
 user_data = <<END
 #!/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"
 END
 
@@ -135,7 +135,7 @@ end
 # step-6
 user_data = <<END
 #!/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/"
 END
 
diff --git a/firstapp/samples/gophercloud/block_storage.go b/firstapp/samples/gophercloud/block_storage.go
index 1c7234f87..27f7beceb 100644
--- a/firstapp/samples/gophercloud/block_storage.go
+++ b/firstapp/samples/gophercloud/block_storage.go
@@ -86,7 +86,7 @@ func main() {
 	}).Extract()
 
 	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`
 
 	imageID := "41ba40fd-e801-4639-a842-e3a2e5a2ebdd"
diff --git a/firstapp/samples/gophercloud/getting_started.go b/firstapp/samples/gophercloud/getting_started.go
index daf16dd48..fe7e36f98 100644
--- a/firstapp/samples/gophercloud/getting_started.go
+++ b/firstapp/samples/gophercloud/getting_started.go
@@ -164,7 +164,7 @@ func main() {
 
 	// step-11
 	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`
 
 	// step-12
diff --git a/firstapp/samples/heat/faafo_autoscaling_workers.yaml b/firstapp/samples/heat/faafo_autoscaling_workers.yaml
index b6c9f1c29..a03e67b24 100644
--- a/firstapp/samples/heat/faafo_autoscaling_workers.yaml
+++ b/firstapp/samples/heat/faafo_autoscaling_workers.yaml
@@ -38,7 +38,7 @@ parameters:
     type: string
     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
-    default: https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh
+    default: https://opendev.org/openstack/faafo/raw/contrib/install.sh
 
 
 resources:
diff --git a/firstapp/samples/heat/hello_faafo.yaml b/firstapp/samples/heat/hello_faafo.yaml
index 2eb3bc51e..038585ae9 100644
--- a/firstapp/samples/heat/hello_faafo.yaml
+++ b/firstapp/samples/heat/hello_faafo.yaml
@@ -32,7 +32,7 @@ parameters:
   faafo_source:
     type: string
     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:
 
diff --git a/firstapp/samples/jclouds/GettingStarted.java b/firstapp/samples/jclouds/GettingStarted.java
index ec1c41f17..51912e8a7 100644
--- a/firstapp/samples/jclouds/GettingStarted.java
+++ b/firstapp/samples/jclouds/GettingStarted.java
@@ -178,7 +178,7 @@ class GettingStarted {
 // # step-11
 
         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";
 
 // # step-12
diff --git a/firstapp/samples/jclouds/Introduction.java b/firstapp/samples/jclouds/Introduction.java
index b3f7ded4f..e6f6fb13d 100644
--- a/firstapp/samples/jclouds/Introduction.java
+++ b/firstapp/samples/jclouds/Introduction.java
@@ -188,7 +188,7 @@ public class Introduction implements Closeable {
 
     // step-2
     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" +
             " -i faafo -i messaging -r api -r worker -r demo\n";
     // step-2-end
@@ -355,7 +355,7 @@ public class Introduction implements Closeable {
 
     private String createApiInstance() {
         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" +
                 " -i messaging -i faafo -r api\n";
         String instanceName = "app-controller";
@@ -370,7 +370,7 @@ public class Introduction implements Closeable {
     // step-12
     private String createWorkerInstance(String apiAccessIP) {
         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" +
                 "   -i faafo -r worker -e 'http://%1$s' -m 'amqp://guest:guest@%1$s:5672/'";
         userData = String.format(userData, apiAccessIP);
diff --git a/firstapp/samples/jclouds/ScalingOut.java b/firstapp/samples/jclouds/ScalingOut.java
index 1aa24fdf5..b1e928fba 100644
--- a/firstapp/samples/jclouds/ScalingOut.java
+++ b/firstapp/samples/jclouds/ScalingOut.java
@@ -189,7 +189,7 @@ public class ScalingOut implements Closeable {
      */
     private String createAppServicesInstance() {
         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";
         CreateServerOptions options = CreateServerOptions.Builder
                 .keyPairName(KEY_PAIR_NAME)
@@ -205,7 +205,7 @@ public class ScalingOut implements Closeable {
      */
     private String createApiInstance(String name, String servicesIp) {
         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" +
                 "    -d 'mysql+pymysql://faafo:password@%1$s:3306/faafo'", servicesIp);
         CreateServerOptions options = CreateServerOptions.Builder
@@ -232,7 +232,7 @@ public class ScalingOut implements Closeable {
      */
     private String createWorkerInstance(String name, String apiIp, String servicesIp) {
         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/'",
                 apiIp, servicesIp);
         CreateServerOptions options = CreateServerOptions.Builder
diff --git a/firstapp/samples/libcloud/getting_started.py b/firstapp/samples/libcloud/getting_started.py
index eea1670de..cf938e937 100755
--- a/firstapp/samples/libcloud/getting_started.py
+++ b/firstapp/samples/libcloud/getting_started.py
@@ -88,7 +88,7 @@ for security_group in conn.ex_list_security_groups():
 
 # step-11
 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
 '''
 
diff --git a/firstapp/samples/libcloud/introduction.py b/firstapp/samples/libcloud/introduction.py
index 0982c78ab..50f85d6ac 100644
--- a/firstapp/samples/libcloud/introduction.py
+++ b/firstapp/samples/libcloud/introduction.py
@@ -1,6 +1,6 @@
 # step-1
 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
 '''
 
@@ -14,7 +14,7 @@ testing_instance = conn.create_node(name=instance_name,
 
 # step-2
 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
 '''
 
@@ -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 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
 '''
 
@@ -97,7 +97,7 @@ else:
     ip_controller = instance_controller_1.public_ips[0]
 
 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/'
 ''' % {'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 8b1c79126..8d090bb15 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 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
 '''
 
@@ -60,7 +60,7 @@ services_ip = instance_services.private_ips[0]
 
 # step-5
 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/' \
     -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 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/'
 ''' % {'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/getting_started.py b/firstapp/samples/openstacksdk/getting_started.py
index e6146c32a..99ef9d1bb 100644
--- a/firstapp/samples/openstacksdk/getting_started.py
+++ b/firstapp/samples/openstacksdk/getting_started.py
@@ -114,7 +114,7 @@ for security_group in conn.network.security_groups():
 
 # step-11
 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
 '''
 userdata_b64str = base64.b64encode(userdata)
diff --git a/firstapp/samples/openstacksdk/introduction.py b/firstapp/samples/openstacksdk/introduction.py
index 72d78fd45..1a3f3e90e 100644
--- a/firstapp/samples/openstacksdk/introduction.py
+++ b/firstapp/samples/openstacksdk/introduction.py
@@ -1,6 +1,6 @@
 # step-1
 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
 '''
 userdata_b64str = base64.b64encode(userdata)
@@ -19,7 +19,7 @@ testing_instance = conn.compute.create_server(**testing_instance_args)
 
 # step-2
 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
 '''
 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)
 
 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
 '''
 userdata_b64str = base64.b64encode(userdata)
@@ -172,7 +172,7 @@ for values in instance_controller_1.addresses.values():
             break
 
 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/'
 ''' % {'ip_controller': ip_controller}
 userdata_b64str = base64.b64encode(userdata)
diff --git a/firstapp/samples/pkgcloud/getting_started.js b/firstapp/samples/pkgcloud/getting_started.js
index 1548ecf11..7234a8f49 100644
--- a/firstapp/samples/pkgcloud/getting_started.js
+++ b/firstapp/samples/pkgcloud/getting_started.js
@@ -140,7 +140,7 @@ if (security_group_exists) {
 
 // step-11
 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";
 userdata = new Buffer(userdata).toString('base64')
 
diff --git a/firstapp/samples/shade/block_storage.py b/firstapp/samples/shade/block_storage.py
index ff166fcc7..1b69c7b5a 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 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
 '''
 
diff --git a/firstapp/samples/shade/getting_started.py b/firstapp/samples/shade/getting_started.py
index 72ec1d154..c88fa6f4e 100644
--- a/firstapp/samples/shade/getting_started.py
+++ b/firstapp/samples/shade/getting_started.py
@@ -70,7 +70,7 @@ conn.search_security_groups(sec_group_name)
 #step-11
 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
 '''
 
diff --git a/firstapp/samples/shade/introduction.py b/firstapp/samples/shade/introduction.py
index 18dc68b87..87c6a62dc 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/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
 '''
 
@@ -17,7 +17,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/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
 '''
 
@@ -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 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
 '''
 
@@ -92,7 +92,7 @@ else:
     ip_controller = conn.get_server_private_ip(instance_controller_1)
 
 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/'
 ''' % {'ip_controller': ip_controller}
 
diff --git a/firstapp/samples/shade/scaling_out.py b/firstapp/samples/shade/scaling_out.py
index 5a3f84d26..4990d4160 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 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
 '''
 
@@ -46,7 +46,7 @@ services_ip = conn.get_server_private_ip(instance_services)
 
 # step-5
 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/' \
     -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 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/'
 ''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}
 
diff --git a/firstapp/source/getting_started.rst b/firstapp/source/getting_started.rst
index 352cff355..4c83adf4f 100644
--- a/firstapp/source/getting_started.rst
+++ b/firstapp/source/getting_started.rst
@@ -355,7 +355,7 @@ to run code snippets in your language of choice.
         :language: yaml
 
     .. 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
               :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
         :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.
 
     .. literalinclude::  ../samples/shade/getting_started.py
diff --git a/firstapp/source/orchestration.rst b/firstapp/source/orchestration.rst
index e81dcf9ed..73b377e88 100644
--- a/firstapp/source/orchestration.rst
+++ b/firstapp/source/orchestration.rst
@@ -96,7 +96,7 @@ Work with stacks: Basics
 **Stack create**
 
 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
 as an all-in-one installation.
 
@@ -108,7 +108,7 @@ You pass in these configuration settings as parameters:
 
 .. 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 \
      --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
 
-    $ 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 \
     --parameters flavor=m1.small\;key_name=test\;image_id=5bbe4073-90c0-4ec9-833c-092459cc4539 \
     faafo_autoscaling_workers