From 9ce6b3fdf9e1ac67d2a6765834f93704b31a61d8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 21 Jul 2015 18:39:02 +0000 Subject: [PATCH] Add a pile of bodhi2 production instances. --- .../bodhi-backend01.phx2.fedoraproject.org | 10 ++++++ .../bodhi-backend02.phx2.fedoraproject.org | 10 ++++++ .../host_vars/bodhi03.phx2.fedoraproject.org | 32 +++++++++++++++++++ .../host_vars/bodhi04.phx2.fedoraproject.org | 32 +++++++++++++++++++ inventory/inventory | 8 +++-- playbooks/groups/bodhi-backend.yml | 4 +-- playbooks/groups/bodhi2.yml | 4 +-- .../files/ccd/bodhi03.phx2.fedoraproject.org | 2 ++ .../files/ccd/bodhi04.phx2.fedoraproject.org | 2 ++ 9 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org create mode 100644 inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org create mode 100644 inventory/host_vars/bodhi03.phx2.fedoraproject.org create mode 100644 inventory/host_vars/bodhi04.phx2.fedoraproject.org create mode 100644 roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org create mode 100644 roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org diff --git a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org new file mode 100644 index 0000000000..2b8564166b --- /dev/null +++ b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org @@ -0,0 +1,10 @@ +--- +nm: 255.255.255.0 +gw: 10.5.125.254 +dns: 10.5.126.21 +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_Server +eth0_ip: 10.5.125.135 +eth1_ip: 10.5.127.61 +vmhost: bvirthost10.phx2.fedoraproject.org diff --git a/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org new file mode 100644 index 0000000000..285da83639 --- /dev/null +++ b/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org @@ -0,0 +1,10 @@ +--- +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 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_bvirthost06 +eth0_ip: 10.5.125.135 +eth1_ip: 10.5.127.62 +vmhost: bvirthost6.phx2.fedoraproject.org diff --git a/inventory/host_vars/bodhi03.phx2.fedoraproject.org b/inventory/host_vars/bodhi03.phx2.fedoraproject.org new file mode 100644 index 0000000000..ab390b8043 --- /dev/null +++ b/inventory/host_vars/bodhi03.phx2.fedoraproject.org @@ -0,0 +1,32 @@ +--- +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 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_virthost01 +eth0_ip: 10.5.126.115 +vmhost: virthost01.phx2.fedoraproject.org +datacenter: phx2 + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: root +- service: bodhi + owner: root + group: bodhi + can_send: + - bodhi.mashtask.mashing + - bodhi.mashtask.complete + - bodhi.mashtask.sync.wait + - bodhi.mashtask.sync.done + - bodhi.update.eject + - bodhi.update.complete.testing + - bodhi.update.complete.stable + - bodhi.update.request.testing + - bodhi.update.request.stable + - bodhi.update.comment + - bodhi.stack.save + - bodhi.stack.delete diff --git a/inventory/host_vars/bodhi04.phx2.fedoraproject.org b/inventory/host_vars/bodhi04.phx2.fedoraproject.org new file mode 100644 index 0000000000..586c3afa22 --- /dev/null +++ b/inventory/host_vars/bodhi04.phx2.fedoraproject.org @@ -0,0 +1,32 @@ +--- +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 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 10.5.126.116 +vmhost: virthost02.phx2.fedoraproject.org +datacenter: phx2 + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: root +- service: bodhi + owner: root + group: bodhi + can_send: + - bodhi.mashtask.mashing + - bodhi.mashtask.complete + - bodhi.mashtask.sync.wait + - bodhi.mashtask.sync.done + - bodhi.update.eject + - bodhi.update.complete.testing + - bodhi.update.complete.stable + - bodhi.update.request.testing + - bodhi.update.request.stable + - bodhi.update.comment + - bodhi.stack.save + - bodhi.stack.delete diff --git a/inventory/inventory b/inventory/inventory index b9ad645486..9a27d5b848 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -90,6 +90,10 @@ blockerbugs01.stg.phx2.fedoraproject.org bodhi01.phx2.fedoraproject.org bodhi02.phx2.fedoraproject.org +[bodhi2] +bodhi03.phx2.fedoraproject.org +bodhi04.phx2.fedoraproject.org + [bodhi-stg] bodhi01.stg.phx2.fedoraproject.org @@ -189,8 +193,8 @@ releng04.phx2.fedoraproject.org relepel01.phx2.fedoraproject.org [bodhi-backend] -#bodhi-backend01.phx2.fedoraproject.org -#bodhi-backend02.phx2.fedoraproject.org +bodhi-backend01.phx2.fedoraproject.org +bodhi-backend02.phx2.fedoraproject.org [bodhi-backend-stg] bodhi-backend01.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index d149a95fdf..2968ef81c6 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -6,7 +6,7 @@ # - name: make bodhi-backend systems - hosts: bodhi-backend-stg + hosts: bodhi-backend:bodhi-backend-stg user: root gather_facts: False @@ -24,7 +24,7 @@ # Once the instance exists, configure it. - name: make bodhi-backend server system - hosts: bodhi-backend-stg + hosts: bodhi-backend:bodhi-backend-stg user: root gather_facts: True diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index 218f265f97..bdceee415e 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -1,5 +1,5 @@ - name: make bodhi2 - hosts: bodhi2-stg + hosts: bodhi2:bodhi2-stg user: root gather_facts: False @@ -15,7 +15,7 @@ - include: "{{ handlers }}/restart_services.yml" - name: make the box be real - hosts: bodhi2-stg + hosts: bodhi2:bodhi2-stg user: root gather_facts: True diff --git a/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org new file mode 100644 index 0000000000..9ac160e0ff --- /dev/null +++ b/roles/openvpn/server/files/ccd/bodhi03.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.145 192.168.0.145 diff --git a/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org new file mode 100644 index 0000000000..2dba8cacf8 --- /dev/null +++ b/roles/openvpn/server/files/ccd/bodhi04.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.146 192.168.0.146