From 70fff265a76478b881b977f3a29276819af5e1c7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 18 May 2020 16:33:06 -0700 Subject: [PATCH] rabbitmq: setup a iad2 cluster. Signed-off-by: Kevin Fenzi --- inventory/group_vars/rabbitmq | 4 ++++ inventory/host_vars/rabbitmq01.iad2.fedoraproject.org | 9 +++++++++ inventory/host_vars/rabbitmq02.iad2.fedoraproject.org | 9 +++++++++ inventory/host_vars/rabbitmq03.iad2.fedoraproject.org | 9 +++++++++ playbooks/groups/postgresql-server.yml | 1 - 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 inventory/host_vars/rabbitmq01.iad2.fedoraproject.org create mode 100644 inventory/host_vars/rabbitmq02.iad2.fedoraproject.org create mode 100644 inventory/host_vars/rabbitmq03.iad2.fedoraproject.org diff --git a/inventory/group_vars/rabbitmq b/inventory/group_vars/rabbitmq index fac66a8518..fe4e5ce6e8 100644 --- a/inventory/group_vars/rabbitmq +++ b/inventory/group_vars/rabbitmq @@ -42,11 +42,15 @@ tcp_ports: [ custom_rules: [ # Neeed for rsync from log01 for logs. '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', # Inter-node traffic '-A INPUT -p tcp -m tcp -s 10.5.126.74 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.75 --dport 25672 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.76 --dport 25672 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.3.163.78 --dport 25672 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.3.163.79 --dport 25672 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.3.163.80 --dport 25672 -j ACCEPT', ] fas_client_groups: sysadmin-main,sysadmin-messaging diff --git a/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org new file mode 100644 index 0000000000..4d095e12ec --- /dev/null +++ b/inventory/host_vars/rabbitmq01.iad2.fedoraproject.org @@ -0,0 +1,9 @@ +--- +volgroup: /dev/vg_guests +vmhost: vmhost-x86-02.iad2.fedoraproject.org +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-8-ext +ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ +eth0_ip: 10.3.163.78 +gw: 10.3.163.254 +dns: 10.3.163.33 +datacenter: iad2 diff --git a/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org new file mode 100644 index 0000000000..bc67672f59 --- /dev/null +++ b/inventory/host_vars/rabbitmq02.iad2.fedoraproject.org @@ -0,0 +1,9 @@ +--- +volgroup: /dev/vg_guests +vmhost: vmhost-x86-03.iad2.fedoraproject.org +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-8-ext +ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ +eth0_ip: 10.3.163.79 +gw: 10.3.163.254 +dns: 10.3.163.33 +datacenter: iad2 diff --git a/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org new file mode 100644 index 0000000000..15ead673d5 --- /dev/null +++ b/inventory/host_vars/rabbitmq03.iad2.fedoraproject.org @@ -0,0 +1,9 @@ +--- +volgroup: /dev/vg_guests +vmhost: vmhost-x86-04.iad2.fedoraproject.org +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-8-ext +ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ +eth0_ip: 10.3.163.80 +gw: 10.3.163.254 +dns: 10.3.163.33 +datacenter: iad2 diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 198fb4a522..0fe34ab2b4 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -30,7 +30,6 @@ - collectd/base - collectd/postgres # This requires a 'databases' var to be set in host_vars - sudo - - { role: openvpn/client, when: inventory_hostname == "db-fas01.phx2.fedoraproject.org" or inventory_hostname == "db01.phx2.fedoraproject.org" } tasks: - import_tasks: "{{ tasks_path }}/2fa_client.yml"