From ed020656af088ada4304ca76c44f39c2ae2a75be Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 17 Mar 2016 22:39:49 +0000 Subject: [PATCH] Prepare for basset prod deployment Signed-off-by: Patrick Uiterwijk --- inventory/group_vars/basset | 14 ++++++++++++++ inventory/group_vars/basset-stg | 8 ++++---- .../host_vars/basset01.phx2.fedoraproject.org | 12 ++++++++++++ playbooks/groups/basset.yml | 4 ++-- 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 inventory/group_vars/basset create mode 100644 inventory/host_vars/basset01.phx2.fedoraproject.org diff --git a/inventory/group_vars/basset b/inventory/group_vars/basset new file mode 100644 index 0000000000..5bab0fa8b4 --- /dev/null +++ b/inventory/group_vars/basset @@ -0,0 +1,14 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 20000 +mem_size: 4096 +num_cpus: 2 + +custom_rules: [ + # fas01, fas02, and fas03 + '-A INPUT -p tcp -m tcp -s 10.5.126.25 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.5.126.26 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.5.126.30 --dport 80 -j ACCEPT' +] + +fas_client_groups: sysadmin-main diff --git a/inventory/group_vars/basset-stg b/inventory/group_vars/basset-stg index 84dc91693a..ad45a6f96f 100644 --- a/inventory/group_vars/basset-stg +++ b/inventory/group_vars/basset-stg @@ -4,9 +4,9 @@ lvm_size: 20000 mem_size: 4096 num_cpus: 2 -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [ 443 ] +custom_rules: [ + # fas01.stg + '-A INPUT -p tcp -m tcp -s 10.5.126.86 --dport 80 -j ACCEPT', +] fas_client_groups: sysadmin-main diff --git a/inventory/host_vars/basset01.phx2.fedoraproject.org b/inventory/host_vars/basset01.phx2.fedoraproject.org new file mode 100644 index 0000000000..e28ba087c5 --- /dev/null +++ b/inventory/host_vars/basset01.phx2.fedoraproject.org @@ -0,0 +1,12 @@ +--- +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.194 +vmhost: virthost19.phx2.fedoraproject.org +datacenter: phx2 diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index b75d7ee55b..88e6ccf06b 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -1,9 +1,9 @@ # create a new basset server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset-stg" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" - name: make the box be real - hosts: basset-stg + hosts: basset:basset-stg user: root gather_facts: True