From 171c5c1054d81c0af92ca9b6d1ac804e85cf5353 Mon Sep 17 00:00:00 2001
From: Rick Elrod <relrod@redhat.com>
Date: Tue, 21 Aug 2018 18:08:02 +0000
Subject: [PATCH] docker->oci

Signed-off-by: Rick Elrod <relrod@redhat.com>
---
 .../{docker-registry => oci-registry}          |  0
 ...andidate-registry01.phx2.fedoraproject.org} |  0
 ...g => oci-registry02.phx2.fedoraproject.org} |  0
 ...g => oci-registry03.phx2.fedoraproject.org} |  0
 inventory/inventory                            | 18 +++++++++---------
 .../{docker-registry.yml => oci-registry.yml}  | 12 ++++++------
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename inventory/group_vars/{docker-registry => oci-registry} (100%)
 rename inventory/host_vars/{docker-candidate-registry01.phx2.fedoraproject.org => oci-candidate-registry01.phx2.fedoraproject.org} (100%)
 rename inventory/host_vars/{docker-registry02.phx2.fedoraproject.org => oci-registry02.phx2.fedoraproject.org} (100%)
 rename inventory/host_vars/{docker-registry03.phx2.fedoraproject.org => oci-registry03.phx2.fedoraproject.org} (100%)
 rename playbooks/groups/{docker-registry.yml => oci-registry.yml} (92%)

diff --git a/inventory/group_vars/docker-registry b/inventory/group_vars/oci-registry
similarity index 100%
rename from inventory/group_vars/docker-registry
rename to inventory/group_vars/oci-registry
diff --git a/inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.phx2.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org
rename to inventory/host_vars/oci-candidate-registry01.phx2.fedoraproject.org
diff --git a/inventory/host_vars/docker-registry02.phx2.fedoraproject.org b/inventory/host_vars/oci-registry02.phx2.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/docker-registry02.phx2.fedoraproject.org
rename to inventory/host_vars/oci-registry02.phx2.fedoraproject.org
diff --git a/inventory/host_vars/docker-registry03.phx2.fedoraproject.org b/inventory/host_vars/oci-registry03.phx2.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/docker-registry03.phx2.fedoraproject.org
rename to inventory/host_vars/oci-registry03.phx2.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index 27f2f584d4..af93f79924 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1441,15 +1441,15 @@ os-control
 [ci]
 ci-cc-rdu01.fedoraproject.org
 
-# Docker (docker-distribution) registries
-[docker-registry]
-docker-registry02.phx2.fedoraproject.org
-docker-registry03.phx2.fedoraproject.org
-docker-candidate-registry01.phx2.fedoraproject.org
+# registries
+[oci-registry]
+oci-registry02.phx2.fedoraproject.org
+oci-registry03.phx2.fedoraproject.org
+oci-candidate-registry01.phx2.fedoraproject.org
 
-[docker-registry-gluster]
-docker-registry02.phx2.fedoraproject.org
-docker-registry03.phx2.fedoraproject.org
+[oci-registry-gluster]
+oci-registry02.phx2.fedoraproject.org
+oci-registry03.phx2.fedoraproject.org
 
 [docker-registry-gluster-stg]
 docker-registry01.stg.phx2.fedoraproject.org
@@ -1462,7 +1462,7 @@ docker-candidate-registry01.stg.phx2.fedoraproject.org
 
 ## Not the candidate just the top registry
 [moby-registry]
-docker-registry02.phx2.fedoraproject.org
+oci-registry02.phx2.fedoraproject.org
 
 ## Not the candidate just the top registry
 [moby-registry-stg]
diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/oci-registry.yml
similarity index 92%
rename from playbooks/groups/docker-registry.yml
rename to playbooks/groups/oci-registry.yml
index 2229639b4e..bc7a42808e 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/oci-registry.yml
@@ -1,8 +1,8 @@
 # create an osbs server
-- import_playbook:  "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=docker-registry:docker-registry-stg"
+- import_playbook:  "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=oci-registry:docker-registry-stg"
 
 - name: make the box be real
-  hosts: docker-registry:docker-registry-stg
+  hosts: oci-registry:docker-registry-stg
   user: root
   gather_facts: True
 
@@ -55,8 +55,8 @@
 
 - name: set up gluster on prod
   hosts:
-  - docker-registry02.phx2.fedoraproject.org
-  - docker-registry03.phx2.fedoraproject.org
+  - oci-registry02.phx2.fedoraproject.org
+  - oci-registry03.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
@@ -70,11 +70,11 @@
     gluster_brick_dir: /srv/glusterfs/
     gluster_mount_dir: /srv/docker/
     gluster_brick_name: registry
-    gluster_server_group: docker-registry-gluster
+    gluster_server_group: oci-registry-gluster
     tags: gluster
 
 - name: setup docker distribution registry
-  hosts: docker-registry:docker-registry-stg
+  hosts: oci-registry:docker-registry-stg
   vars_files:
     - /srv/web/infra/ansible/vars/global.yml
     - /srv/private/ansible/vars.yml