diff --git a/inventory/host_vars/docker-registry02.phx2.fedoraproject.org b/inventory/host_vars/docker-registry02.phx2.fedoraproject.org new file mode 100644 index 0000000000..ba7248901a --- /dev/null +++ b/inventory/host_vars/docker-registry02.phx2.fedoraproject.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.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/ +volgroup: /dev/vg_guests +eth0_ip: 10.5.125.77 +vmhost: bvirthost02.phx2.fedoraproject.org +datacenter: phx2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/docker-registry03.phx2.fedoraproject.org b/inventory/host_vars/docker-registry03.phx2.fedoraproject.org new file mode 100644 index 0000000000..65b99885ca --- /dev/null +++ b/inventory/host_vars/docker-registry03.phx2.fedoraproject.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.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/ +volgroup: /dev/vg_guests +eth0_ip: 10.5.125.78 +vmhost: bvirthost03.phx2.fedoraproject.org +datacenter: phx2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/inventory b/inventory/inventory index 9aa0343652..df1171788e 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1391,6 +1391,8 @@ ci-cc-rdu01.fedoraproject.org # Docker (docker-distribution) registries [docker-registry] docker-registry01.phx2.fedoraproject.org +docker-registry02.phx2.fedoraproject.org +docker-registry03.phx2.fedoraproject.org docker-candidate-registry01.phx2.fedoraproject.org [docker-registry-stg] diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 980b983fba..c6e816f9d7 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -63,6 +63,37 @@ group: root mountdir: "/srv/docker" +- name: set up gluster on prod + hosts: + - docker-registry02.phx2.fedoraproject.org + user: root + gather_facts: True + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + roles: + - role: gluster/server + name: gluster + username: "{{ registry_gluster_username_prod }}" + password: "{{ registry_gluster_password_prod }}" + owner: root + group: root + datadir: /srv/glusterfs/registry + + - role: gluster/client + name: gluster + servers: + - docker-registry02.phx2.fedoraproject.org + username: "{{ registry_gluster_username_prod }}" + password: "{{ registry_gluster_password_prod }}" + owner: root + group: root + mountdir: "/srv/docker" + + - name: setup docker distribution registry hosts: docker-registry:docker-registry-stg vars_files: diff --git a/roles/openvpn/server/files/ccd/docker-registry02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/docker-registry02.phx2.fedoraproject.org new file mode 100644 index 0000000000..cf4a1082c2 --- /dev/null +++ b/roles/openvpn/server/files/ccd/docker-registry02.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.168 192.168.0.168 diff --git a/roles/openvpn/server/files/ccd/docker-registry03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/docker-registry03.phx2.fedoraproject.org new file mode 100644 index 0000000000..86f8b27242 --- /dev/null +++ b/roles/openvpn/server/files/ccd/docker-registry03.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.169 192.168.0.169