From 97ff16dbc514ac2cf0c5ea1bc454eba837c6fe9e Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Sun, 1 Apr 2018 21:47:27 +0000 Subject: [PATCH] Rebuild docker registry stg boxes as f27 (#6744) Signed-off-by: Ricky Elrod --- ...date-registry01.stg.phx2.fedoraproject.org | 4 +-- ...cker-registry01.stg.phx2.fedoraproject.org | 4 +-- ...cker-registry02.stg.phx2.fedoraproject.org | 4 +-- playbooks/groups/docker-registry.yml | 26 +++++-------------- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org index c2fbf40d09..d3444b8e60 100644 --- a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-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-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.128.122 vmhost: virthost20.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org index cca485a17a..2dd8fba525 100644 --- a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-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-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.128.123 vmhost: virthost20.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org index 815bfde1cc..4ada59b2df 100644 --- a/inventory/host_vars/docker-registry02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-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-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.128.124 vmhost: virthost12.phx2.fedoraproject.org diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 342a3f212c..dcffdfee00 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -44,24 +44,12 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - role: gluster/server - name: gluster - username: "{{ registry_gluster_username_stg }}" - password: "{{ registry_gluster_password_stg }}" - owner: root - group: root - datadir: /srv/glusterfs/registry-stg - - - role: gluster/client - name: gluster - servers: - - docker-registry01.stg.phx2.fedoraproject.org - - docker-registry02.stg.phx2.fedoraproject.org - username: "{{ registry_gluster_username_stg }}" - password: "{{ registry_gluster_password_stg }}" - 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: registry-stg + tags: gluster - name: set up gluster on prod hosts: @@ -106,7 +94,7 @@ # NOTE: tls is disabled for docker-distribution because we are listening only # on localhost and all external connections will be through httpd which - # will be SSL enalbed. + # will be SSL enabled. roles: - { role: docker-distribution,