From ac9b360f5379c88aee73a4a6c4935901b23eba50 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 21 Aug 2018 17:28:55 +0000 Subject: [PATCH] prep for docker reg rebuild Signed-off-by: Rick Elrod --- ...andidate-registry01.phx2.fedoraproject.org | 4 +-- .../docker-registry02.phx2.fedoraproject.org | 4 +-- .../docker-registry03.phx2.fedoraproject.org | 4 +-- inventory/inventory | 4 +++ playbooks/groups/docker-registry.yml | 25 +++++-------------- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org b/inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org index bd87883da8..a46f49a89c 100644 --- a/inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-candidate-registry01.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -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/ +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/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.57 vmhost: bvirthost01.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry02.phx2.fedoraproject.org b/inventory/host_vars/docker-registry02.phx2.fedoraproject.org index 0f13c692d8..a5f6d17c49 100644 --- a/inventory/host_vars/docker-registry02.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-registry02.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -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/ +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/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.77 vmhost: bvirthost01.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry03.phx2.fedoraproject.org b/inventory/host_vars/docker-registry03.phx2.fedoraproject.org index db421414ba..1117fd37f5 100644 --- a/inventory/host_vars/docker-registry03.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-registry03.phx2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -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/ +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/ volgroup: /dev/vg_guests eth0_ip: 10.5.125.78 vmhost: bvirthost04.phx2.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 843b832a39..27f2f584d4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1447,6 +1447,10 @@ docker-registry02.phx2.fedoraproject.org docker-registry03.phx2.fedoraproject.org docker-candidate-registry01.phx2.fedoraproject.org +[docker-registry-gluster] +docker-registry02.phx2.fedoraproject.org +docker-registry03.phx2.fedoraproject.org + [docker-registry-gluster-stg] docker-registry01.stg.phx2.fedoraproject.org docker-registry02.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index a35e6e2f2c..2229639b4e 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -66,25 +66,12 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - role: gluster/server - glusterservername: gluster - username: "{{ registry_gluster_username_prod }}" - password: "{{ registry_gluster_password_prod }}" - owner: root - group: root - datadir: /srv/glusterfs/registry - - - role: gluster/client - glusterservername: gluster - servers: - - docker-registry02.phx2.fedoraproject.org - - docker-registry03.phx2.fedoraproject.org - username: "{{ registry_gluster_username_prod }}" - password: "{{ registry_gluster_password_prod }}" - owner: root - group: root - mountdir: "/srv/docker" - + - role: gluster/consolidated + gluster_brick_dir: /srv/glusterfs/ + gluster_mount_dir: /srv/docker/ + gluster_brick_name: registry + gluster_server_group: docker-registry-gluster + tags: gluster - name: setup docker distribution registry hosts: docker-registry:docker-registry-stg