From 1180728939bf0350e9d022d0cd126c391a6c391e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 4 Apr 2019 18:47:12 +0000 Subject: [PATCH] repospanner/ansible: Move back to the old cluster setup on new ports Signed-off-by: Kevin Fenzi --- inventory/group_vars/batcave | 2 +- inventory/group_vars/pagure | 2 +- inventory/group_vars/repospanner | 2 ++ playbooks/groups/batcave.yml | 10 ++++++++- playbooks/groups/pagure.yml | 11 +++++++++- playbooks/groups/repospanner.yml | 36 ++++++++++++++++---------------- 6 files changed, 41 insertions(+), 22 deletions(-) diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave index 13e8d21714..6424ec0a6b 100644 --- a/inventory/group_vars/batcave +++ b/inventory/group_vars/batcave @@ -3,7 +3,7 @@ lvm_size: 500000 mem_size: 24576 num_cpus: 10 -tcp_ports: [ 80, 443, 8443, 8444 ] +tcp_ports: [ 80, 443, 8442, 8443 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] diff --git a/inventory/group_vars/pagure b/inventory/group_vars/pagure index 22c559f480..2bb8330ad6 100644 --- a/inventory/group_vars/pagure +++ b/inventory/group_vars/pagure @@ -8,7 +8,7 @@ num_cpus: 12 # the host_vars/$hostname file tcp_ports: [ 22, 25, 80, 443, 9418, - 8443, 8444, + 8442, 8443, # Used for the eventsource 8088, # This is for the pagure public fedmsg relay diff --git a/inventory/group_vars/repospanner b/inventory/group_vars/repospanner index 8b8bc9aee1..3fe921b763 100644 --- a/inventory/group_vars/repospanner +++ b/inventory/group_vars/repospanner @@ -19,5 +19,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 8.43.84.211 --dport 8443:8445 -j ACCE '-A INPUT -p tcp -m tcp -s 192.168.1.184 --dport 8443:8445 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.185 --dport 8443:8445 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.23 --dport 8443:8445 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 192.168.1.41 --dport 8442:8443 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 192.168.100.8 --dport 8442:8443 -j ACCEPT'] ## End of file diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index e0f7213ac8..11378ea1f1 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -31,7 +31,15 @@ SSLCertificateChainFile: "{{wildcard_int_file}}" - openvpn/client - batcave - - { role: repospanner/server, when: inventory_hostname.startswith('batcave01'), node: batcave01, region: ansible, spawn_repospanner_node: false, join_repospanner_node: repospanner01.ansible.fedoraproject.org } + - { role: repospanner/server, + node: batcave01, + region: ansible, + spawn_repospanner_node: false, + join_repospanner_node: repospanner01.ansible.fedoraproject.org + rpc_port: 8442, + http_port: 8443, + when: inventory_hostname == 'batcave01.phx2.fedoraproject.org' + } - { role: nfs/client, when: inventory_hostname.startswith('batcave'), mnt_dir: '/srv/web/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: inventory_hostname.startswith('batcave01'), mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index a6dd601eca..e6550a8ad4 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -56,7 +56,16 @@ roles: - pagure/frontend - pagure/fedmsg - - { role: repospanner/server, when: inventory_hostname.startswith('pagure01'), node: pagure01, region: ansible, spawn_repospanner_node: false, join_repospanner_node: repospanner01.ansible.fedoraproject.org } + - { role: repospanner/server, + node: pagure01, + region: ansible, + spawn_repospanner_node: false, + join_repospanner_node: repospanner01.ansible.fedoraproject.org + rpc_port: 8442, + http_port: 8443, + when: inventory_hostname == 'pagure01.fedoraproject.org' + } + handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/repospanner.yml b/playbooks/groups/repospanner.yml index b1b0d04102..7ba4820d4b 100644 --- a/playbooks/groups/repospanner.yml +++ b/playbooks/groups/repospanner.yml @@ -32,24 +32,24 @@ http_port: 8443, when: inventory_hostname == 'repospanner01.phx2.fedoraproject.org' } - - { role: repospanner/server, - node: repospanner02, - region: ansible, - spawn_repospanner_node: false, - join_repospanner_node: repospanner01.ansible.fedoraproject.org, - rpc_port: 8442, - http_port: 8443, - when: inventory_hostname == 'repospanner-cc-rdu01.fedoraproject.org' - } - - { role: repospanner/server, - node: repospanner03, - region: ansible, - spawn_repospanner_node: false, - join_repospanner_node: repospanner01.ansible.fedoraproject.org, - rpc_port: 8442, - http_port: 8443, - when: inventory_hostname == 'repospanner-osuosl01.fedoraproject.org' - } +# - { role: repospanner/server, +# node: repospanner02, +# region: ansible, +# spawn_repospanner_node: false, +# join_repospanner_node: repospanner01.ansible.fedoraproject.org, +# rpc_port: 8442, +# http_port: 8443, +# when: inventory_hostname == 'repospanner-cc-rdu01.fedoraproject.org' +# } +# - { role: repospanner/server, +# node: repospanner03, +# region: ansible, +# spawn_repospanner_node: false, +# join_repospanner_node: repospanner01.ansible.fedoraproject.org, +# rpc_port: 8442, +# http_port: 8443, +# when: inventory_hostname == 'repospanner-osuosl01.fedoraproject.org' +# } ## The RPMs region is used to sync up pkgs from Fedora and CentOS. The ## CentOS nodes are the spawn leaders for this as they are getting data