From 33895180cb467a51586f633b8f8ea54ff7fe3b19 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 1 Apr 2015 17:17:20 -0500 Subject: [PATCH] Support for Fedora 20 Signed-off-by: Andrew Schoen --- roles/testnode/tasks/main.yml | 4 ++++ roles/testnode/tasks/setup-fedora.yml | 15 +++++++++++++++ roles/testnode/tasks/yum/gpg_keys.yml | 18 ++++++++++++++++++ roles/testnode/tasks/yum/repos.yml | 8 +++++++- roles/testnode/templates/grub | 4 ++++ 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 roles/testnode/tasks/setup-fedora.yml create mode 100644 roles/testnode/tasks/yum/gpg_keys.yml create mode 100644 roles/testnode/templates/grub diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index d23daa6..bc88e27 100644 --- 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 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 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 fcf1773..2bff84f 100644 --- 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 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" -- 2.39.5