From b5b7220f2620eeca2ed36d02a120ffdcf7d18bfa Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Sun, 8 Nov 2015 23:04:45 +0000 Subject: [PATCH] try watchdog stuff on fedocal01.stg Signed-off-by: Ricky Elrod --- .../fedocal01.stg.phx2.fedoraproject.org | 9 +++++++++ playbooks/groups/fedocal.yml | 1 + roles/watchdog/handlers/main.yml | 3 +++ roles/watchdog/tasks/main.yml | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 roles/watchdog/handlers/main.yml create mode 100644 roles/watchdog/tasks/main.yml diff --git a/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org b/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org index 601b0afd8d..24942d3113 100644 --- a/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/fedocal01.stg.phx2.fedoraproject.org @@ -10,3 +10,12 @@ volgroup: /dev/vg_guests eth0_ip: 10.5.126.66 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 + +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' + --network bridge=br0,model=virtio + --autostart --noautoconsole --watchdog default diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 7d9a060779..1f9f25c1fa 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -12,6 +12,7 @@ roles: - base + - { role: watchdog, when: env == "staging" } - rkhunter - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client diff --git a/roles/watchdog/handlers/main.yml b/roles/watchdog/handlers/main.yml new file mode 100644 index 0000000000..76965db786 --- /dev/null +++ b/roles/watchdog/handlers/main.yml @@ -0,0 +1,3 @@ +--- +- name: restart watchdog + service: name=watchdog state=restarted diff --git a/roles/watchdog/tasks/main.yml b/roles/watchdog/tasks/main.yml new file mode 100644 index 0000000000..f22619e5eb --- /dev/null +++ b/roles/watchdog/tasks/main.yml @@ -0,0 +1,18 @@ +--- +# +# Setup watchdog +# +- name: install needed packages + yum: pkg={{ item }} state=present + with_items: + - watchdog + tags: + - packages + - watchdog + +- name: watchdog device configuration + copy: src=watchdog-device dest=/etc/waatchdog.d/watchdog-device owner=root group=root mode=644 + tags: + - config + - watchdog + notify: restart watchdog