Support for Fedora 20

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml
index d23daa6ed3b78282b580cc51e3bbfc10dd17f9f2..bc88e2781a139d02464a7d400ba5f421bb4e39c6 100644 (file)
--- a/roles/testnode/tasks/main.yml
+++ b/roles/testnode/tasks/main.yml
@@ -34,6 +34,10 @@
 - include: setup-redhat.yml
   when: ansible_distribution == 'RedHat'
 
+# configure fedora specific things
+- include: setup-fedora.yml
+  when: ansible_distribution == "Fedora"
+
 # configure pip to use our mirror
 - include: pip.yml
   tags:

diff --git a/roles/testnode/tasks/setup-fedora.yml b/roles/testnode/tasks/setup-fedora.yml
new file mode 100644 (file)
index 0000000..4065587
--- /dev/null
+++ b/roles/testnode/tasks/setup-fedora.yml
@@ -0,0 +1,15 @@
+---
+- include: imitate_ubuntu.yml
+
+- name: Set grub config.
+  template:
+    src: grub
+    dest: /etc/default/grub
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Disable firewalld
+  service:
+    name: firewalld
+    state: stopped

diff --git a/roles/testnode/tasks/yum/gpg_keys.yml b/roles/testnode/tasks/yum/gpg_keys.yml
new file mode 100644 (file)
index 0000000..e992112
--- /dev/null
+++ b/roles/testnode/tasks/yum/gpg_keys.yml
@@ -0,0 +1,18 @@
+---
+# this is needed for the rpm_key module so it can
+# figure out if the key you're adding is already
+# installed or not.
+- name: Install GPG
+  yum:
+    name: gpg
+    state: present
+
+- name: Install GPG keys
+  rpm_key:
+    state: present
+    key: "{{ item }}"
+    validate_certs: no
+  with_items:
+    - 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+    - 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc' 
+  register: gpg_keys

diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index fcf17738a77261d97f9826196789baf62841d5e1..2bff84f48b24003972c80ff63abb5c43ca1101e8 100644 (file)
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -21,7 +21,13 @@
   with_dict: yum_repos
   when: yum_repos.keys() | length > 0
 
+- include: gpg_keys.yml
+  when: ansible_distribution == "Fedora"
+  tags:
+    - gpg-keys
+
 - name: Clean yum cache
   shell: yum clean all
   changed_when: false
-  when: repo_file and repo_file.changed
+  when: (repo_file and repo_file.changed) or
+        (gpg_keys and gpg_keys.changed)

diff --git a/roles/testnode/templates/grub b/roles/testnode/templates/grub
new file mode 100644 (file)
index 0000000..6686cb0
--- /dev/null
+++ b/roles/testnode/templates/grub
@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+GRUB_DEFAULT=saved
+GRUB_TIMEOUT=5
+GRUB_DISABLE_LINUX_UUID="true"