From c5a75f25175599027a07e55353c6687ce5df5615 Mon Sep 17 00:00:00 2001
From: Stephane Armanet <stephanearmanet@esss.lu.se>
Date: Tue, 26 Feb 2019 08:15:28 +0100
Subject: [PATCH] remove tag_cleanup filter
---
filter_plugins/tags_cleanup.py | 22 ----------------------
handlers/main.yml | 2 +-
tasks/install_component.yml | 7 ++-----
tasks/setup-pxe.yml | 19 +++++++------------
4 files changed, 10 insertions(+), 40 deletions(-)
delete mode 100644 filter_plugins/tags_cleanup.py
diff --git a/filter_plugins/tags_cleanup.py b/filter_plugins/tags_cleanup.py
deleted file mode 100644
index ce4dc89..0000000
--- a/filter_plugins/tags_cleanup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-class FilterModule(object):
- def filters(self):
- return {
- 'tags_cleanup': self.tags_cleanup
- }
-
- def tags_cleanup(self, tags):
- deploy_tags = ["LCR","IOC","Server","autoinstallTag1"]
- return_tag = []
-
- if not tags:
- tags = ["default"]
- else:
- for t in tags:
- if t in deploy_tags:
- return_tag.append(t)
-
- else:
- return_tag.append("default")
- tags = return_tag
-
- return tags[0]
diff --git a/handlers/main.yml b/handlers/main.yml
index 9ab996d..cc39e88 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -3,4 +3,4 @@
service:
name: nginx
enabled: true
- state: started
+ state: restarted
diff --git a/tasks/install_component.yml b/tasks/install_component.yml
index a503673..fd9f7a1 100644
--- a/tasks/install_component.yml
+++ b/tasks/install_component.yml
@@ -2,15 +2,14 @@
- name: install atftp server
yum:
name: "atftp-server"
- state: latest
+ state: present
tags:
- install
- name: install xinetd
yum:
name: "xinetd.x86_64"
- state: latest
- register: tftp_installed
+ state: present
tags:
- install
@@ -18,7 +17,6 @@
file:
path: "{{ tftp_root }}"
state: directory
- when: tftp_installed
- name: configure tftp
template:
@@ -27,7 +25,6 @@
owner: root
group: root
mode: 0644
- when: tftp_installed
- name: start xinetd
service:
diff --git a/tasks/setup-pxe.yml b/tasks/setup-pxe.yml
index 94e25db..0d27b51 100644
--- a/tasks/setup-pxe.yml
+++ b/tasks/setup-pxe.yml
@@ -1,18 +1,12 @@
---
-- name: create grub EFI folder
+- name: create boot folders
file:
- path: "{{ tftp_root }}/EFI"
- state: directory
-
-- name: create BIOS config folder
- file:
- path: "{{ tftp_root }}/boot"
- state: directory
-
-- name: create BIOS menu folder
- file:
- path: "{{ tftp_root }}/grub-menu"
+ path: "{{ tftp_root }}/{{ item }}"
state: directory
+ whit_items:
+ - EFI
+ - boot
+ - grub-menu
- name: copy GRUB BIOS loader
copy:
@@ -89,6 +83,7 @@
get_url:
url: "{{ isolinux_kernel_url }}/{{ item }}"
dest: "{{ pxe_kernel_path }}/{{ item }}"
+ force: true
with_items:
- vmlinuz
- initrd.img
--
GitLab