docker->oci

Signed-off-by: Rick Elrod <relrod@redhat.com>
This commit is contained in:
Rick Elrod 2018-08-21 18:08:02 +00:00
parent ac9b360f53
commit 171c5c1054
6 changed files with 15 additions and 15 deletions

View file

@ -1441,15 +1441,15 @@ os-control
[ci] [ci]
ci-cc-rdu01.fedoraproject.org ci-cc-rdu01.fedoraproject.org
# Docker (docker-distribution) registries # registries
[docker-registry] [oci-registry]
docker-registry02.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org
docker-registry03.phx2.fedoraproject.org oci-registry03.phx2.fedoraproject.org
docker-candidate-registry01.phx2.fedoraproject.org oci-candidate-registry01.phx2.fedoraproject.org
[docker-registry-gluster] [oci-registry-gluster]
docker-registry02.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org
docker-registry03.phx2.fedoraproject.org oci-registry03.phx2.fedoraproject.org
[docker-registry-gluster-stg] [docker-registry-gluster-stg]
docker-registry01.stg.phx2.fedoraproject.org docker-registry01.stg.phx2.fedoraproject.org
@ -1462,7 +1462,7 @@ docker-candidate-registry01.stg.phx2.fedoraproject.org
## Not the candidate just the top registry ## Not the candidate just the top registry
[moby-registry] [moby-registry]
docker-registry02.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org
## Not the candidate just the top registry ## Not the candidate just the top registry
[moby-registry-stg] [moby-registry-stg]

View file

@ -1,8 +1,8 @@
# create an osbs server # 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 - name: make the box be real
hosts: docker-registry:docker-registry-stg hosts: oci-registry:docker-registry-stg
user: root user: root
gather_facts: True gather_facts: True
@ -55,8 +55,8 @@
- name: set up gluster on prod - name: set up gluster on prod
hosts: hosts:
- docker-registry02.phx2.fedoraproject.org - oci-registry02.phx2.fedoraproject.org
- docker-registry03.phx2.fedoraproject.org - oci-registry03.phx2.fedoraproject.org
user: root user: root
gather_facts: True gather_facts: True
@ -70,11 +70,11 @@
gluster_brick_dir: /srv/glusterfs/ gluster_brick_dir: /srv/glusterfs/
gluster_mount_dir: /srv/docker/ gluster_mount_dir: /srv/docker/
gluster_brick_name: registry gluster_brick_name: registry
gluster_server_group: docker-registry-gluster gluster_server_group: oci-registry-gluster
tags: gluster tags: gluster
- name: setup docker distribution registry - name: setup docker distribution registry
hosts: docker-registry:docker-registry-stg hosts: oci-registry:docker-registry-stg
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml
- /srv/private/ansible/vars.yml - /srv/private/ansible/vars.yml