Rename opendev projects we missed

In the next batch of renames, we should clean up after the
repos we missed the first time.

Depends-On: https://review.opendev.org/657275
Change-Id: I4a70949c5d90970d29608f5a70c8af8d3ed85b17

gerrit/acls/opendev/zone-zuul-ci.org.config

@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group zone-zuul-ci-core
+label-Code-Review = -2..+2 group zone-zuul-ci-core
+label-Workflow = -1..+1 group zone-zuul-ci-core
+
+[access "refs/tags/*"]
+pushSignedTag = group zone-zuul-ci-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true

gerrit/projects.yaml

@@ -150,6 +150,9 @@
   use-storyboard: true
   groups:
     - openstack-ci
+- project: opendev/ci-sandbox
+  description: Sandbox for 3rd party CI systems
+  use-storyboard: true
 - project: opendev/elastic-recheck
   use-storyboard: true
   groups:
@@ -242,6 +245,8 @@
   use-storyboard: true
   groups:
     - openstack-ci
+- project: opendev/netlify-sandbox
+  description: sandbox for testing netlify cms integration with Gerrit.
 - project: opendev/project-config
   description: Zuul configuration for the OpenDev tenant
   use-storyboard: true
@@ -684,6 +689,10 @@
 - project: opendev/pypi-mirror
   description: RETIRED, PyPI mirror builder
   acl-config: /home/gerrit2/acls/openstack/retired.config
+- project: opendev/sandbox
+  description: Sandbox for first time contributors
+  groups:
+    - openstack-dev-sandbox
 - project: opendev/python-storyboardclient
   use-storyboard: true
   description: Python Client library for StoryBoard
@@ -717,6 +726,17 @@
 - project: opendev/yaml2ical
   use-storyboard: true
   description: Generate iCal files from a YAML description of meetings
+- project: opendev/zone-opendev.org
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Zone file for opendev.org
+- project: opendev/zone-zuul-ci.org
+  use-storyboard: true
+  groups:
+    - openstack-ci
+    - zuul
+  description: Zone file for zuul-ci.org
 - project: openstack-attic/akanda
 - project: openstack-attic/akanda-appliance-builder
   acl-config: /home/gerrit2/acls/openstack-attic/akanda.config
@@ -732,23 +752,12 @@
 - project: openstack-attic/oslo.version
 - project: openstack-attic/python-melangeclient
 - project: openstack-attic/volume-api
-- project: openstack-dev/ci-sandbox
-  description: Sandbox for 3rd party CI systems
-  use-storyboard: true
-- project: openstack-dev/os-http
-  description: Simple HTTP CLI for OpenStack services
-- project: openstack-dev/sandbox
-  description: Sandbox for first time contributors
-  groups:
-    - openstack-dev-sandbox
 - project: openstack-infra/beaker-localhost
   description: RETIRED, Beaker hypervisor for controlling localhost
   acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: openstack-infra/beaker-nodepool
   description: RETIRED, Beaker hypervisor for using nodepool gear and/or rest api
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/netlify-sandbox
-  description: sandbox for testing netlify cms integration with Gerrit.
 - project: openstack-infra/opendev-website
   use-storyboard: true
   groups:
@@ -763,18 +772,6 @@
 - project: openstack-infra/vinz-webclient
   description: RETIRED, Standalone UI replacment for Gerrit
   acl-config: /home/gerrit2/acls/openstack/retired.config
-- project: openstack-infra/zone-opendev.org
-  use-storyboard: true
-  groups:
-    - openstack-ci
-  description: Zone file for opendev.org
-- project: openstack-infra/zone-zuul-ci.org
-  use-storyboard: true
-  groups:
-    - openstack-ci
-    - zuul
-  description: Zone file for zuul-ci.org
-  acl-config: /home/gerrit2/acls/zuul/zuul.config
 - project: openstack/activity-board
   description: RETIRED, Tech community metrics dash of the OpenStack community based
     on the Metrics Grimoire toolset
@@ -7571,6 +7568,8 @@
   homepage: https://wiki.openstack.org/wiki/Ops-telecom-nfv
 - project: x/os-dpm
   description: Shared library for networking-dpm and nova-dpm
+- project: x/os-http
+  description: Simple HTTP CLI for OpenStack services
 - project: x/os-log-merger
   use-storyboard: true
   description: Merge OpenStack related logs meaningfully.

gerritbot/channels.yaml

@@ -243,10 +243,9 @@ opendev:
     - opendev/subunit2sql
     - opendev/system-config
     - opendev/yaml2ical
-    - openstack-infra/ansible-build-image
+    - opendev/zone-opendev.org
+    - opendev/zone-zuul-ci.org
     - openstack-infra/opendev-website
-    - openstack-infra/zone-opendev.org
-    - openstack-infra/zone-zuul-ci.org
     - openstack/bugdaystats
     - openstack/cookiecutter
     - openstack/devstack-gate
@@ -920,10 +919,9 @@ openstack-infra:
     - opendev/subunit2sql
     - opendev/system-config
     - opendev/yaml2ical
-    - openstack-infra/ansible-build-image
+    - opendev/zone-opendev.org
+    - opendev/zone-zuul-ci.org
     - openstack-infra/opendev-website
-    - openstack-infra/zone-opendev.org
-    - openstack-infra/zone-zuul-ci.org
     - openstack/bugdaystats
     - openstack/cookiecutter
     - openstack/devstack-gate
@@ -1293,7 +1291,6 @@ openstack-merges:
     - opendev/statusbot
     - opendev/storyboard
     - opendev/system-config
-    - openstack-infra/puppet-docker_registry
     - openstack/activity-board
     - openstack/api-site
     - openstack/arch-wg
@@ -1804,7 +1801,6 @@ openstack-sdks:
     - patchset-created
     - change-merged
   projects:
-    - openstack-dev/os-http
     - openstack/api-sig
     - openstack/cliff
     - openstack/js-openstack-lib
@@ -2420,7 +2416,7 @@ zuul:
     - patchset-created
     - change-merged
   projects:
-    - openstack-infra/zone-zuul-ci.org
+    - opendev/zone-zuul-ci.org
     - x/pbrx
     - zuul/nodepool
     - zuul/project-config

zuul.d/projects.yaml

@@ -1341,19 +1341,12 @@
         - tox-pep8
 
 - project:
-    name: openstack-dev/ci-sandbox
+    name: opendev/ci-sandbox
     templates:
       - noop-jobs
 
 - project:
-    name: openstack-dev/os-http
+    name: opendev/sandbox
-    templates:
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - publish-to-pypi
-
-- project:
-    name: openstack-dev/sandbox
     release:
       jobs:
         - release-openstack-python
@@ -7690,6 +7683,13 @@
       - check-requirements
       - publish-to-pypi
 
+- project:
+    name: x/os-http
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - publish-to-pypi
+
 - project:
     name: x/os-log-merger
     templates:

zuul/main.yaml

@@ -104,9 +104,12 @@
           - jjb/python-jenkins
           - limestone/ci-cloud-config
           - opendev/afsmon
+          - opendev/ansible-role-cloud-launcher
           - opendev/ansible-role-puppet
           - opendev/askbot-theme
           - opendev/bindep
+          - opendev/ci-sandbox:
+              exclude: pipeline
           - opendev/elastic-recheck
           - opendev/gear
           - opendev/germqtt
@@ -126,6 +129,7 @@
           - opendev/lpmqtt
           - opendev/meetbot
           - opendev/mqtt_statsd
+          - opendev/netlify-sandbox
           - opendev/project-config-example
           - opendev/publications
           - opendev/puppet-accessbot
@@ -211,20 +215,16 @@
           - opendev/puppet-zuul
           - opendev/pynotedb
           - opendev/python-storyboardclient
+          - opendev/sandbox
           - opendev/statusbot
           - opendev/storyboard
           - opendev/storyboard-webclient
           - opendev/subunit2sql
           - opendev/system-config
           - opendev/yaml2ical
-          - openstack-dev/os-http
+          - opendev/zone-opendev.org
-          - openstack-dev/sandbox
+          - opendev/zone-zuul-ci.org
-          - openstack-dev/ci-sandbox:
-              exclude: pipeline
-          - openstack-infra/netlify-sandbox
           - openstack-infra/opendev-website
-          - openstack-infra/zone-opendev.org
-          - openstack-infra/zone-zuul-ci.org
           - openstack/adjutant
           - openstack/adjutant-ui
           - openstack/ansible-config_template
@@ -1086,7 +1086,6 @@
           - x/alexandria
           - x/almanach
           - x/ansible-role-bindep
-          - x/ansible-role-cloud-launcher
           - x/ansible-role-fedmsg
           - x/ansible-role-jenkins
           - x/ansible-role-jenkins-job-builder