From fe244ad281dc36f26f065f2d40f2ec3f4d24cc35 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 10 Jun 2019 12:51:58 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
tasks/cleanup.yml | 14 +++++++-------
tasks/ec2/inithost.yml | 8 ++++----
tasks/ec2/inithostip.yml | 4 ++--
tasks/ec2/removehost.yml | 2 +-
tasks/jiffybox/inithost.yml | 2 +-
tasks/jiffybox/inithostip.yml | 2 +-
tasks/jiffybox/removehost.yml | 2 +-
tasks/linode/inithost.yml | 2 +-
tasks/linode/inithostip.yml | 2 +-
tasks/linode/removehost.yml | 2 +-
tasks/main.yml | 10 ++++++----
tasks/none/inithost.yml | 2 +-
tasks/none/inithostip.yml | 2 +-
tasks/none/removehost.yml | 2 +-
14 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/tasks/cleanup.yml b/tasks/cleanup.yml
index 7507a9d..f08b0ed 100644
--- a/tasks/cleanup.yml
+++ b/tasks/cleanup.yml
@@ -1,28 +1,28 @@
---
# file: cleanup.yml
-- name: "Remove host from known_hosts"
+- name: Remove host from known_hosts
known_hosts:
name="{{ item }}"
state="absent"
with_items:
- - '{{ static_ipv4|default(false) }}'
- - '{{ host }}'
+ - {{ static_ipv4|default(false) }}
+ - {{ host }}
-- name: "Remove host from hosts file 1"
+- name: Remove host from hosts file 1
lineinfile:
dest=/etc/hosts
regexp='{{ item }}'
state=absent
become: yes
with_items:
- - '^{{ static_ipv4|default(false) }} '
+ - ^{{ static_ipv4|default(false) }}
-- name: "Remove host from hosts file 2"
+- name: Remove host from hosts file 2
lineinfile:
dest=/etc/hosts
regexp='{{ item }}'
state=absent
become: yes
with_items:
- - '.* {{ host }}$'
+ - .* {{ host }}$
diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index 599419c..48caca9 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -4,9 +4,9 @@
---
# file: ec2/inithost.yml
-- name: "Create the new instance"
+- name: Create the new instance
ec2:
- instance_tags: '{"Name":"Ansible-Host-{{ host }}","AnsibleHost":"{{ host }}","AnsibleGroups":"{{ initgroups }}"}'
+ instance_tags: {"Name":"Ansible-Host-{{ host }}","AnsibleHost":"{{ host }}","AnsibleGroups":"{{ initgroups }}"}
assign_public_ip: yes
group_id: "{{ ec2_group_id }}"
key_name: "{{ ec2_key_name }}"
@@ -18,7 +18,7 @@
wait: yes
register: ec2
-- name: "Waiting for the new instance(s) to get up and running"
+- name: Waiting for the new instance(s) to get up and running
ec2:
instance_ids: "{{ ec2.instance_ids }}"
instance_type: "{{ ec2_instance_type }}"
@@ -28,7 +28,7 @@
- block:
- - name: "Associate an elastic IP with the new instance"
+ - name: Associate an elastic IP with the new instance
ec2_eip:
device_id: "{{ item }}"
public_ip: '{{ inithostip }}'
diff --git a/tasks/ec2/inithostip.yml b/tasks/ec2/inithostip.yml
index 7e57143..f2b75b4 100644
--- a/tasks/ec2/inithostip.yml
+++ b/tasks/ec2/inithostip.yml
@@ -1,13 +1,13 @@
---
# file: ec2/inithostip.yml
-- name: "Add new instance(s) to the inventory"
+- name: Add new instance(s) to the inventory
add_host:
hostname="{{ host }}"
static_ipv4="{{ hostip }}"
groups="{{ initgroups }}"
-- name: "Waiting for SSH service becoming available"
+- name: Waiting for SSH service becoming available
wait_for:
host="{{ hostip }}"
port=22
diff --git a/tasks/ec2/removehost.yml b/tasks/ec2/removehost.yml
index 10671e7..fd1d007 100644
--- a/tasks/ec2/removehost.yml
+++ b/tasks/ec2/removehost.yml
@@ -4,7 +4,7 @@
---
# file: ec2/removehost.yml
-- name: "Terminate the instance"
+- name: Terminate the instance
ec2:
instance_ids: "{{ ec2_id }}"
instance_type: "{{ ec2_instance_type }}"
diff --git a/tasks/jiffybox/inithost.yml b/tasks/jiffybox/inithost.yml
index a4ec82d..ce90e4f 100644
--- a/tasks/jiffybox/inithost.yml
+++ b/tasks/jiffybox/inithost.yml
@@ -4,5 +4,5 @@
---
# file: jiffybox/inithost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithost"
diff --git a/tasks/jiffybox/inithostip.yml b/tasks/jiffybox/inithostip.yml
index d2fadfc..dc57e9e 100644
--- a/tasks/jiffybox/inithostip.yml
+++ b/tasks/jiffybox/inithostip.yml
@@ -4,5 +4,5 @@
---
# file: jiffybox/inithostip.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithostip"
diff --git a/tasks/jiffybox/removehost.yml b/tasks/jiffybox/removehost.yml
index a8dc7a1..914a40f 100644
--- a/tasks/jiffybox/removehost.yml
+++ b/tasks/jiffybox/removehost.yml
@@ -4,5 +4,5 @@
---
# file: jiffybox/removehost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE removehost"
diff --git a/tasks/linode/inithost.yml b/tasks/linode/inithost.yml
index 36f5e27..32417c2 100644
--- a/tasks/linode/inithost.yml
+++ b/tasks/linode/inithost.yml
@@ -4,5 +4,5 @@
---
# file: linode/inithost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithost"
diff --git a/tasks/linode/inithostip.yml b/tasks/linode/inithostip.yml
index 8cd6c3f..01ea4b0 100644
--- a/tasks/linode/inithostip.yml
+++ b/tasks/linode/inithostip.yml
@@ -4,5 +4,5 @@
---
# file: linode/inithostip.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithostip"
diff --git a/tasks/linode/removehost.yml b/tasks/linode/removehost.yml
index fed0061..c471fea 100644
--- a/tasks/linode/removehost.yml
+++ b/tasks/linode/removehost.yml
@@ -4,5 +4,5 @@
---
# file: linode/removehost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE removehost"
diff --git a/tasks/main.yml b/tasks/main.yml
index e1ad6e4..1b36010 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,11 @@
---
# file: roles/cloud/tasks/main.yml
-- name: "Cloud Role"
- set_fact: role_cloud_started=true
- tags: 'always'
+- name: Cloud Role
+ set_fact:
+ role_cloud_started: yes
+ tags:
+ - always
- block:
@@ -11,4 +13,4 @@
- import_tasks: "{{ mode }}.yml"
- when: '"cloud" not in excluded_roles'
+ when: not excluded_roles or "cloud" not in excluded_roles
diff --git a/tasks/none/inithost.yml b/tasks/none/inithost.yml
index 897b4f8..47e3d4a 100644
--- a/tasks/none/inithost.yml
+++ b/tasks/none/inithost.yml
@@ -4,5 +4,5 @@
---
# file: none/inithost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithost"
diff --git a/tasks/none/inithostip.yml b/tasks/none/inithostip.yml
index 628d690..9debde9 100644
--- a/tasks/none/inithostip.yml
+++ b/tasks/none/inithostip.yml
@@ -4,5 +4,5 @@
---
# file: none/inithostip.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE inithostip"
diff --git a/tasks/none/removehost.yml b/tasks/none/removehost.yml
index 176680a..a5ae914 100644
--- a/tasks/none/removehost.yml
+++ b/tasks/none/removehost.yml
@@ -4,5 +4,5 @@
---
# file: none/removehost.yml
-- name: "No cloud action required"
+- name: No cloud action required
debug: msg="IGNORE removehost"
--
GitLab