diff --git a/inventory/group_vars/oci-registry b/inventory/group_vars/oci-registry index c37c9a89f5..32d1d40286 100644 --- a/inventory/group_vars/oci-registry +++ b/inventory/group_vars/oci-registry @@ -6,14 +6,6 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers" tcp_ports: [ 5000, - # These ports all required for gluster - 111, 24007, 24008, 24009, 24010, 24011, - 49152, 49153, 49154, 49155, ] -# gluster -udp_ports: [111] - -registry_gluster_username_prod: registry-prod - nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" diff --git a/inventory/group_vars/oci-registry-stg b/inventory/group_vars/oci-registry-stg index 9761264a04..217e47a4ba 100644 --- a/inventory/group_vars/oci-registry-stg +++ b/inventory/group_vars/oci-registry-stg @@ -5,14 +5,6 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers" tcp_ports: [ 5000, - # These ports all required for gluster - 111, 24007, 24008, 24009, 24010, 24011, - 49152, 49153, 49154, 49155, ] -# gluster -udp_ports: [111] - -registry_gluster_username_stg: registry-stg - nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" diff --git a/inventory/inventory b/inventory/inventory index 9937a3d0b4..a3c88d4b89 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1455,13 +1455,6 @@ oci-registry01.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org oci-candidate-registry01.phx2.fedoraproject.org -[oci-registry-gluster] -oci-registry01.phx2.fedoraproject.org -oci-registry02.phx2.fedoraproject.org - -[oci-registry-gluster-stg] -oci-registry01.stg.phx2.fedoraproject.org - [oci-registry-stg] oci-registry01.stg.phx2.fedoraproject.org oci-candidate-registry01.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index 5091634c73..ee94221b93 100644 --- a/playbooks/groups/oci-registry.yml +++ b/playbooks/groups/oci-registry.yml @@ -45,45 +45,6 @@ handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" -- name: set up gluster on stg - hosts: - - oci-registry01.stg.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/consolidated - gluster_brick_dir: /srv/glusterfs - gluster_mount_dir: /srv/docker/ - gluster_brick_name: registry - gluster_server_group: oci-registry-gluster-stg - tags: gluster - -- name: set up gluster on prod - hosts: - - oci-registry01.phx2.fedoraproject.org - - oci-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/consolidated - gluster_brick_dir: /srv/glusterfs - gluster_mount_dir: /srv/docker/ - gluster_brick_name: registry - gluster_server_group: oci-registry-gluster - tags: gluster - - name: setup docker distribution registry hosts: oci-registry:oci-registry-stg vars_files: