From 8180aa4f6725632b9362cb79631de96d05cfd77e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 5 May 2015 21:23:40 +0000 Subject: [PATCH] Fix up host and group vars for bodhi-backend01.stg --- inventory/group_vars/bodhi-backend-stg | 38 +++++++++++++++++++ ...bodhi-backend01.stg.phx2.fedoraproject.org | 8 +--- 2 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 inventory/group_vars/bodhi-backend-stg diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg new file mode 100644 index 0000000000..36e7ef2d75 --- /dev/null +++ b/inventory/group_vars/bodhi-backend-stg @@ -0,0 +1,38 @@ +--- +# common items for the releng-* boxes +lvm_size: 100000 +mem_size: 4096 +num_cpus: 2 +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-6 +ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ + +virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }} -l {{ ks_repo }} -x + "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none + ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none" + --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio + --autostart --noautoconsole + +# With 16 cpus, theres a bunch more kernel threads +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +host_group: releng + +# 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: masher + +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org index 952fe3de94..d451818c70 100644 --- a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org @@ -5,10 +5,6 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.24 +eth0_ip: 10.5.126.90 +eth1_ip: 10.5.127.65 vmhost: virthost12.phx2.fedoraproject.org -datacenter: phx2 -# This overrides a group var and lets the playbook know that we should -# install special cron jobs here. -master_sundries_node: True -mirrorlist_procs: 45