diff --git a/inventory/group_vars/oci-registry b/inventory/group_vars/oci-registry index bf3de779b9..c6d6efaaca 100644 --- a/inventory/group_vars/oci-registry +++ b/inventory/group_vars/oci-registry @@ -1,6 +1,4 @@ --- -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-docker-reg -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ fas_client_groups: sysadmin-releng diff --git a/inventory/group_vars/docker-registry-stg b/inventory/group_vars/oci-registry-stg similarity index 75% rename from inventory/group_vars/docker-registry-stg rename to inventory/group_vars/oci-registry-stg index 13aacb4f1b..680732381c 100644 --- a/inventory/group_vars/docker-registry-stg +++ b/inventory/group_vars/oci-registry-stg @@ -1,7 +1,4 @@ --- -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-docker-reg -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ - fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-veteran sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org similarity index 69% rename from inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org rename to inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org index e833527ea2..e7a3d5e905 100644 --- a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-docker-reg -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-docker-reg +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.122 vmhost: virthost04.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org similarity index 69% rename from inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org rename to inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org index 351e7b0428..57bb8eacab 100644 --- a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-docker-reg -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-docker-reg +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.123 vmhost: virthost04.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org b/inventory/host_vars/oci-registry02.stg.phx2.fedoraproject.org similarity index 69% rename from inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org rename to inventory/host_vars/oci-registry02.stg.phx2.fedoraproject.org index 446f9f6015..04cb1a4bcc 100644 --- a/inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/oci-registry02.stg.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-docker-reg -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-docker-reg +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.124 vmhost: virthost01.stg.phx2.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index c7c01f2c03..6c0390f00b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -772,8 +772,8 @@ db-koji01.stg.phx2.fedoraproject.org db01.stg.phx2.fedoraproject.org db03.stg.phx2.fedoraproject.org docker-candidate-registry01.stg.phx2.fedoraproject.org -docker-registry01.stg.phx2.fedoraproject.org -docker-registry02.stg.phx2.fedoraproject.org +oci-registry01.stg.phx2.fedoraproject.org +oci-registry02.stg.phx2.fedoraproject.org elections01.stg.phx2.fedoraproject.org fas01.stg.phx2.fedoraproject.org fedimg01.stg.phx2.fedoraproject.org @@ -1479,13 +1479,13 @@ oci-candidate-registry01.phx2.fedoraproject.org oci-registry01.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org -[docker-registry-gluster-stg] -docker-registry01.stg.phx2.fedoraproject.org -docker-registry02.stg.phx2.fedoraproject.org +[oci-registry-gluster-stg] +oci-registry01.stg.phx2.fedoraproject.org +oci-registry02.stg.phx2.fedoraproject.org -[docker-registry-stg] -docker-registry01.stg.phx2.fedoraproject.org -docker-registry02.stg.phx2.fedoraproject.org +[oci-registry-stg] +oci-registry01.stg.phx2.fedoraproject.org +oci-registry02.stg.phx2.fedoraproject.org docker-candidate-registry01.stg.phx2.fedoraproject.org ## Not the candidate just the top registry @@ -1494,7 +1494,7 @@ oci-registry01.phx2.fedoraproject.org ## Not the candidate just the top registry [moby-registry-stg] -docker-registry01.stg.phx2.fedoraproject.org +oci-registry01.stg.phx2.fedoraproject.org [webservers:children] proxies diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index 905309c641..5dd4b10d15 100644 --- a/playbooks/groups/oci-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=oci-registry:docker-registry-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=oci-registry:oci-registry-stg" - name: make the box be real - hosts: oci-registry:docker-registry-stg + hosts: oci-registry:oci-registry-stg user: root gather_facts: True @@ -35,8 +35,8 @@ - name: set up gluster on stg hosts: - - docker-registry01.stg.phx2.fedoraproject.org - - docker-registry02.stg.phx2.fedoraproject.org + - oci-registry01.stg.phx2.fedoraproject.org + - oci-registry02.stg.phx2.fedoraproject.org user: root gather_facts: True @@ -50,7 +50,7 @@ gluster_brick_dir: /srv/glusterfs gluster_mount_dir: /srv/docker/ gluster_brick_name: registry - gluster_server_group: docker-registry-gluster-stg + gluster_server_group: oci-registry-gluster-stg tags: gluster - name: set up gluster on prod @@ -74,7 +74,7 @@ tags: gluster - name: setup docker distribution registry - hosts: oci-registry:docker-registry-stg + hosts: oci-registry:oci-registry-stg vars_files: - /srv/web/infra/ansible/vars/global.yml - /srv/private/ansible/vars.yml