From badb9a6c47f52549706ed2e20cfc6f8cbef69fb3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 May 2019 18:45:10 +0000 Subject: [PATCH] communishift: add some proxies. Signed-off-by: Kevin Fenzi --- inventory/group_vars/os-proxies | 2 ++ .../host_vars/os-proxy01.fedorainfracloud.org | 18 ++++++++++++ .../host_vars/os-proxy02.fedorainfracloud.org | 18 ++++++++++++ inventory/inventory | 4 +++ master.yml | 1 + playbooks/groups/os-proxies.yml | 29 +++++++++++++++++++ 6 files changed, 72 insertions(+) create mode 100644 inventory/group_vars/os-proxies create mode 100644 inventory/host_vars/os-proxy01.fedorainfracloud.org create mode 100644 inventory/host_vars/os-proxy02.fedorainfracloud.org create mode 100644 playbooks/groups/os-proxies.yml diff --git a/inventory/group_vars/os-proxies b/inventory/group_vars/os-proxies new file mode 100644 index 0000000000..2198c72b77 --- /dev/null +++ b/inventory/group_vars/os-proxies @@ -0,0 +1,2 @@ +--- +datacenter: cloud diff --git a/inventory/host_vars/os-proxy01.fedorainfracloud.org b/inventory/host_vars/os-proxy01.fedorainfracloud.org new file mode 100644 index 0000000000..d7db238745 --- /dev/null +++ b/inventory/host_vars/os-proxy01.fedorainfracloud.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.254.0 +gw: 38.145.49.254 +dns: 8.8.8.8 +num_cpus: 4 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-29 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/x86_64/os/ + +vmhost: virthost-os01.fedoraproject.org +volgroup: /dev/vg_guests + +eth0_ip: 38.145.48.42 + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 + +vpn: false diff --git a/inventory/host_vars/os-proxy02.fedorainfracloud.org b/inventory/host_vars/os-proxy02.fedorainfracloud.org new file mode 100644 index 0000000000..d7db238745 --- /dev/null +++ b/inventory/host_vars/os-proxy02.fedorainfracloud.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.254.0 +gw: 38.145.49.254 +dns: 8.8.8.8 +num_cpus: 4 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-29 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/x86_64/os/ + +vmhost: virthost-os01.fedoraproject.org +volgroup: /dev/vg_guests + +eth0_ip: 38.145.48.42 + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 + +vpn: false diff --git a/inventory/inventory b/inventory/inventory index b2ad91075d..272114ea51 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1519,3 +1519,7 @@ virthost-os03.fedorainfracloud.org #virthost-ppc64le-os01.fedorainfracloud.org virthost-aarch64-os01.fedorainfracloud.org virthost-aarch64-os02.fedorainfracloud.org + +[os-proxies] +os-proxy01.fedorainfracloud.org +os-proxy02.fedorainfracloud.org diff --git a/master.yml b/master.yml index 6e0f236292..68670ee238 100644 --- a/master.yml +++ b/master.yml @@ -78,6 +78,7 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-proxies.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure-proxy.yml diff --git a/playbooks/groups/os-proxies.yml b/playbooks/groups/os-proxies.yml new file mode 100644 index 0000000000..57d3037315 --- /dev/null +++ b/playbooks/groups/os-proxies.yml @@ -0,0 +1,29 @@ +# create a new proxy server + +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-proxies" + +- name: make the box be real + hosts: os-proxies + 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 + + pre_tasks: + - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + + roles: + - base + - fas_client + - rkhunter + - nagios_client + - collectd/base + - sudo + + tasks: + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml"