diff --git a/manifests/site.pp b/manifests/site.pp
index 8b2c0f6328..72cd70e000 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -650,7 +650,7 @@ node /^status\d*\.open.*\.org$/ {
class { 'openstack_project::server': }
class { 'openstack_project::status':
- gerrit_host => 'review.openstack.org',
+ gerrit_host => 'review.opendev.org',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
reviewday_ssh_public_key => hiera('reviewday_rsa_pubkey_contents'),
reviewday_ssh_private_key => hiera('reviewday_rsa_key_contents'),
@@ -684,7 +684,7 @@ node /^survey\d+\.open.*\.org$/ {
node /^nl\d+\.open.*\.org$/ {
$group = 'nodepool'
- # NOTE(ianw) From 09-2018 (https://review.openstack.org/#/c/598329/)
+ # NOTE(ianw) From 09-2018 (https://review.opendev.org/#/c/598329/)
# the cloud credentials are deployed with ansible via the
# configure-openstacksdk role and are no longer configured here
@@ -738,7 +738,7 @@ node /^nb\d+\.open.*\.org$/ {
node /^ze\d+\.open.*\.org$/ {
$group = "zuul-executor"
- $gerrit_server = 'review.openstack.org'
+ $gerrit_server = 'review.opendev.org'
$gerrit_user = 'zuul'
$gerrit_ssh_host_key = hiera('gerrit_ssh_rsa_pubkey_contents')
$gerrit_ssh_private_key = hiera('gerrit_ssh_private_key_contents')
@@ -851,7 +851,7 @@ node /^ze\d+\.open.*\.org$/ {
# Node-OS: xenial
node /^zuul\d+\.open.*\.org$/ {
$group = "zuul-scheduler"
- $gerrit_server = 'review.openstack.org'
+ $gerrit_server = 'review.opendev.org'
$gerrit_user = 'zuul'
$gerrit_ssh_host_key = hiera('gerrit_zuul_user_ssh_key_contents')
$zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
@@ -1013,7 +1013,7 @@ node /^zuul\d+\.open.*\.org$/ {
node /^zm\d+.open.*\.org$/ {
$group = "zuul-merger"
- $gerrit_server = 'review.openstack.org'
+ $gerrit_server = 'review.opendev.org'
$gerrit_user = 'zuul'
$gerrit_ssh_host_key = hiera('gerrit_ssh_rsa_pubkey_contents')
$zuul_ssh_private_key = hiera('zuulv3_ssh_private_key_contents')
diff --git a/modules/openstack_project/files/gerrit/web_server.py b/modules/openstack_project/files/gerrit/web_server.py
index 4ddb99755e..8c61a122b6 100755
--- a/modules/openstack_project/files/gerrit/web_server.py
+++ b/modules/openstack_project/files/gerrit/web_server.py
@@ -150,7 +150,7 @@ def parse_opts():
default="https://zuul.openstack.org")
parser.add_argument('-g', '--gerrit-url',
help='url for gerrit server',
- default="https://review.openstack.org")
+ default="https://review.opendev.org")
return parser.parse_args()
diff --git a/modules/openstack_project/files/git/commit-filter.sh b/modules/openstack_project/files/git/commit-filter.sh
index 936ad68796..e54cd62bd2 100644
--- a/modules/openstack_project/files/git/commit-filter.sh
+++ b/modules/openstack_project/files/git/commit-filter.sh
@@ -1,7 +1,7 @@
#!/bin/sh
sed -re '
-s`(I[0-9a-f]{8,40})`\0`g
+s`(I[0-9a-f]{8,40})`\0`g
s`\b([0-9a-fA-F]{8,40})\b`\0`g
s`(\b[Bb]ug\b|\b[Ll][Pp]\b)[ \t#:]*([0-9]+)`\0`g
s`(\b[Ss]tory\b)[ \t#:]*([0-9]+)`\0`g
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index b02b5f1710..89b77e9af6 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -105,7 +105,7 @@ class openstack_project::gerrit (
'openstack-dev/devstack',
],
container => 'rss',
- json_url => 'https://review.openstack.org/query?q=status:open',
+ json_url => 'https://review.opendev.org/query?q=status:open',
swift_username => $swift_username,
swift_password => $swift_password,
swift_auth_url => 'https://auth.api.rackspacecloud.com/v1.0',
diff --git a/modules/openstack_project/manifests/mirror.pp b/modules/openstack_project/manifests/mirror.pp
index 96ead7deaf..e09e262971 100644
--- a/modules/openstack_project/manifests/mirror.pp
+++ b/modules/openstack_project/manifests/mirror.pp
@@ -44,7 +44,7 @@ class openstack_project::mirror (
# Create the symlink to pypi.
# NOTE(ianw) : retired 2018-11-22; see
- # https://review.openstack.org/#/c/618326/
+ # https://review.opendev.org/#/c/618326/
file { "${www_root}/pypi":
ensure => absent,
}
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index cab90fb156..d2fda062a4 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -173,7 +173,7 @@ class openstack_project::status (
git_url => 'https://opendev.org/openstack/reviewday',
serveradmin => 'webmaster@openstack.org',
httproot => '/srv/static/reviewday',
- gerrit_url => 'review.openstack.org',
+ gerrit_url => 'review.opendev.org',
gerrit_port => '29418',
gerrit_user => 'reviewday',
reviewday_gerrit_ssh_key => $gerrit_ssh_host_key,
diff --git a/modules/openstack_project/templates/review.projects.ini.erb b/modules/openstack_project/templates/review.projects.ini.erb
index 51a46b5914..390ffb1394 100644
--- a/modules/openstack_project/templates/review.projects.ini.erb
+++ b/modules/openstack_project/templates/review.projects.ini.erb
@@ -1,11 +1,11 @@
[projects]
-homepage=http://openstack.org
+homepage=https://opendev.org
acl-dir=/home/gerrit2/acls
local-git-dir=<%= @local_git_dir %>
jeepyb-cache-dir=<%= @jeepyb_cache_dir %>
-gerrit-host=review.openstack.org
+gerrit-host=review.opendev.org
gerrit-user=openstack-project-creator
-gerrit-committer=OpenStack Project Creator
+gerrit-committer=OpenDev Project Creator
gerrit-key=<%= @ssh_project_key %>
github-config=/etc/github/github-projects.secure.config
has-wiki=False
diff --git a/playbooks/rename_repos.yaml b/playbooks/rename_repos.yaml
index c799f993c2..2c8ec9959d 100644
--- a/playbooks/rename_repos.yaml
+++ b/playbooks/rename_repos.yaml
@@ -101,7 +101,7 @@
- name: Set base ssh command fact
set_fact:
- gerrit_ssh_command: ssh -p 29418 -i /home/gerrit2/review_site/etc/ssh_project_rsa_key openstack-project-creator@review.openstack.org gerrit
+ gerrit_ssh_command: ssh -p 29418 -i /home/gerrit2/review_site/etc/ssh_project_rsa_key openstack-project-creator@review.opendev.org gerrit
- name: Rename groups in gerrit
shell: "{{ gerrit_ssh_command }} rename-group {{ item.old }} {{ item.new }}"
diff --git a/tools/atc/README b/tools/atc/README
index ca5d58e166..79557669db 100644
--- a/tools/atc/README
+++ b/tools/atc/README
@@ -1,7 +1,7 @@
These are the scripts used to create the ATC lists for use in PTL
elections and Summit invitations.
-1) Run the following queries on review.openstack.org:
+1) Run the following queries on review.opendev.org:
sudo -H mysql -e 'SELECT * FROM accounts;' reviewdb > accounts.tab
sudo -H mysql -e 'SELECT * FROM account_external_ids;' reviewdb > emails.tab
diff --git a/tools/atc/email_stats.py b/tools/atc/email_stats.py
index 20dd5a4cbc..eb6da133b8 100755
--- a/tools/atc/email_stats.py
+++ b/tools/atc/email_stats.py
@@ -102,7 +102,7 @@ def repo_stats(repo, output, begin, end, keyfile, user):
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
client.load_system_host_keys()
client.connect(
- 'review.openstack.org', port=29418,
+ 'review.opendev.org', port=29418,
key_filename=os.path.expanduser(keyfile), username=user)
stdin, stdout, stderr = client.exec_command(
'gerrit query %s --all-approvals --format JSON' % QUERY)
@@ -166,7 +166,7 @@ def get_repos(url, keyfile, user):
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
client.load_system_host_keys()
client.connect(
- 'review.openstack.org', port=29418,
+ 'review.opendev.org', port=29418,
key_filename=os.path.expanduser(keyfile), username=user)
stdin, stdout, stderr = client.exec_command('gerrit ls-projects')
gerrit_repos = [x.strip() for x in stdout]
diff --git a/tools/gerrit-2.8.4-cleanup.sh b/tools/gerrit-2.8.4-cleanup.sh
index 2baabc0ae9..f9568cb593 100755
--- a/tools/gerrit-2.8.4-cleanup.sh
+++ b/tools/gerrit-2.8.4-cleanup.sh
@@ -47,11 +47,11 @@ mysql -u$DB_USER -p$DB_PASS reviewdb -e "DELETE FROM submodule_subscriptions WHE
# name in steps 5, 6 and 8:
# https://etherpad.openstack.org/p/project-renames-November-6-2015
-# 5. Update the database on review.openstack.org
+# 5. Update the database on review.opendev.org
mysql -u$DB_USER -p$DB_PASS reviewdb -e "update account_project_watches set project_name='openstack-attic/akanda' where project_name='openstack-attic/akanada';"
mysql -u$DB_USER -p$DB_PASS reviewdb -e "update changes set dest_project_name='openstack-attic/akanda', created_on=created_on where dest_project_name='openstack-attic/akanada';"
-# 6. Move both the Git repository and the mirror on review.openstack.org
+# 6. Move both the Git repository and the mirror on review.opendev.org
sudo mv ~gerrit2/review_site/git/{openstack-attic/akanada,openstack-attic/akanda}.git
sudo mv /opt/lib/git/{openstack-attic/akanada,openstack-attic/akanda}.git
diff --git a/tools/lp_openid_lookup b/tools/lp_openid_lookup
index e8b008d3e9..aa5e7108e2 100755
--- a/tools/lp_openid_lookup
+++ b/tools/lp_openid_lookup
@@ -17,7 +17,7 @@
# useful when you need to determine the LP account associated with a
# login.launchpad.net OpenId. Pass the OpenId URL in question as the
# only command-line parameter, and run this in the gerrit2 homedir on
-# review.openstack.org (or hack it to use your own LP API key instead).
+# review.opendev.org (or hack it to use your own LP API key instead).
import os
import sys
diff --git a/tools/owners.py b/tools/owners.py
index 50e0a194fa..f9f1a7f127 100644
--- a/tools/owners.py
+++ b/tools/owners.py
@@ -31,7 +31,7 @@
# official governance project-team (or "all") ending with a .yaml
# extension. At the time of writing, it takes approximately 30
# minutes to run on a well-connected machine with 70-80ms round-trip
-# latency to review.openstack.org.
+# latency to review.opendev.org.
# An example for generating the March 2016 technical election rolls:
#
@@ -190,7 +190,7 @@ def query_gerrit(method, params={}):
"""Query the Gerrit REST API"""
# The base URL to Gerrit REST API
- GERRIT_API_URL = 'https://review.openstack.org/'
+ GERRIT_API_URL = 'https://review.opendev.org/'
raw = requester(GERRIT_API_URL + method, params=params,
headers={'Accept': 'application/json'})
@@ -228,11 +228,11 @@ def lookup_member(email):
def usage(argv):
"""Parse command line argument"""
parser = argparse.ArgumentParser(
- description="When run using OpenStack's Gerrit server, this builds "
+ description="When run using OpenDev's Gerrit server, this builds "
"YAML representations of aggregate change owner details and change "
"counts for each governance project-team, as well as a combined set "
"for all teams. Before and after dates/times should be supplied in "
- "formats Gerrit accepts: https://review.openstack.org/Documentation/"
+ "formats Gerrit accepts: https://review.opendev.org/Documentation/"
"user-search.html#search-operators")
parser.add_argument("-a", "--after", help="Start date for matching merges")
parser.add_argument("-b", "--before", help="End date for matching merges")
diff --git a/tools/who-approves.py b/tools/who-approves.py
index 8e455b8d4e..55b240e3d9 100755
--- a/tools/who-approves.py
+++ b/tools/who-approves.py
@@ -29,13 +29,13 @@
# without needing to request it.
# Use: This needs your Gerrit username passed as the command-line
-# parameter, found at https://review.openstack.org/#/settings/ when
+# parameter, found at https://review.opendev.org/#/settings/ when
# authenticated in the WebUI. It also prompts for an HTTP password
-# which https://review.openstack.org/#/settings/http-password will
+# which https://review.opendev.org/#/settings/http-password will
# allow you to generate. The results end up in files named
# approvers.json and approvers.yaml. At the time of writing, it
# takes approximately 6.5 minutes to run on a well-connected machine
-# with 70-80ms round-trip latency to review.openstack.org.
+# with 70-80ms round-trip latency to review.opendev.org.
# Example:
#
@@ -84,7 +84,7 @@ import sys
import requests
import yaml
-gerrit_url = 'https://review.openstack.org/'
+gerrit_url = 'https://review.opendev.org/'
try:
gerrit_auth = requests.auth.HTTPDigestAuth(sys.argv[1], getpass.getpass())
except IndexError: