From 9dd769e6b85c01b161d8baebc21a1fbd0ee1e2e9 Mon Sep 17 00:00:00 2001 From: "ansible-code-bot[bot]" <145416087+ansible-code-bot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:13:03 +0000 Subject: [PATCH] Fix ansible-lint rule violations --- 01_azure.yml | 6 +-- 01_azure_tower.yml | 6 +-- 01_facts.yml | 2 - 01_linux.yml | 3 +- 01_loop.yml | 10 ++-- 01_roles.yml | 2 +- 01_stat.yml | 2 +- 01_vars.yml | 6 +-- 01_webserver_azure.yml | 4 +- 02_azure.yml | 89 +++++++++++++++---------------- 02_azure_tower.yml | 88 +++++++++++++++--------------- 02_domain.yml | 2 +- 02_loop.yml | 4 +- 02_roles.yml | 2 +- 03_azure.yml | 4 +- roles/webserver/defaults/main.yml | 12 ++--- roles/webserver/meta/main.yml | 13 ++--- webserver.azure_rm.yml | 3 +- 18 files changed, 126 insertions(+), 132 deletions(-) diff --git a/01_azure.yml b/01_azure.yml index c536692..1274263 100644 --- a/01_azure.yml +++ b/01_azure.yml @@ -7,11 +7,11 @@ tasks: - name: Create resource group azure.azcollection.azure_rm_resourcegroup: - name: "webserver_{{ user }}" + name: webserver_{{ user }} location: northeurope tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining register: rg - name: Show RG ansible.builtin.debug: diff --git a/01_azure_tower.yml b/01_azure_tower.yml index c536692..1274263 100644 --- a/01_azure_tower.yml +++ b/01_azure_tower.yml @@ -7,11 +7,11 @@ tasks: - name: Create resource group azure.azcollection.azure_rm_resourcegroup: - name: "webserver_{{ user }}" + name: webserver_{{ user }} location: northeurope tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining register: rg - name: Show RG ansible.builtin.debug: diff --git a/01_facts.yml b/01_facts.yml index f0aeb00..70bb7af 100644 --- a/01_facts.yml +++ b/01_facts.yml @@ -7,12 +7,10 @@ ansible.builtin.debug: msg: "{{ ansible_facts }}" - - name: Debug Facts Hostname - Unsafe Text ansible.builtin.debug: msg: "{{ ansible_facts['nodename'] }}" - - name: Debug Facts ipv4 - List ansible.builtin.debug: msg: "{{ ansible_facts['all_ipv4_addresses'][0] }}" diff --git a/01_linux.yml b/01_linux.yml index 694d8eb..acfa989 100644 --- a/01_linux.yml +++ b/01_linux.yml @@ -8,8 +8,7 @@ ansible.builtin.file: path: /root/testfile.txt state: touch - mode: '0755' - + mode: "0755" - name: Add line in file ansible.builtin.lineinfile: diff --git a/01_loop.yml b/01_loop.yml index 8c47bfb..8ba9d1e 100644 --- a/01_loop.yml +++ b/01_loop.yml @@ -19,8 +19,8 @@ name: "{{ item.name }}" group: "{{ item.groups }}" loop: - - { name: 'homer', groups: 'Developers' } - - { name: 'bart', groups: 'It' } - - { name: 'lisa', groups: 'Management' } - - { name: 'ned', groups: 'Finance' } - - { name: 'moe', groups: 'Developers' } + - { name: homer, groups: Developers } + - { name: bart, groups: It } + - { name: lisa, groups: Management } + - { name: ned, groups: Finance } + - { name: moe, groups: Developers } diff --git a/01_roles.yml b/01_roles.yml index 3b61c18..7fa27b5 100644 --- a/01_roles.yml +++ b/01_roles.yml @@ -4,4 +4,4 @@ become: true roles: - - jesperberth.el_httpd + - jesperberth.el_httpd diff --git a/01_stat.yml b/01_stat.yml index 5e08258..6774c77 100644 --- a/01_stat.yml +++ b/01_stat.yml @@ -17,7 +17,7 @@ ansible.builtin.get_url: url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip dest: ~/awscliv2.zip - mode: '0700' + mode: "0700" when: not awsfile.stat.exists - name: Unzip aws-cli diff --git a/01_vars.yml b/01_vars.yml index 881cfe5..c7f2c2d 100644 --- a/01_vars.yml +++ b/01_vars.yml @@ -41,13 +41,12 @@ rescue: - name: Print when errors ansible.builtin.debug: - msg: 'There is an error in this block)' + msg: There is an error in this block) always: - name: Always do this ansible.builtin.debug: - msg: "Will always run" - + msg: Will always run - name: Configure firewall ansible.posix.firewalld: @@ -60,7 +59,6 @@ - firewall - config - handlers: - name: Firewall reload ansible.builtin.systemd: diff --git a/01_webserver_azure.yml b/01_webserver_azure.yml index b0cce36..8a3387f 100644 --- a/01_webserver_azure.yml +++ b/01_webserver_azure.yml @@ -3,8 +3,8 @@ hosts: tag_solution_webserver_alex become: true vars: - websiteheader: "Ansible Playbook" - websiteauthor: "Alex" + websiteheader: Ansible Playbook + websiteauthor: Alex tasks: - name: Install Apache diff --git a/02_azure.yml b/02_azure.yml index 28c87c7..a0c689a 100644 --- a/02_azure.yml +++ b/02_azure.yml @@ -5,10 +5,10 @@ vars: user: alex location: northeurope - virtual_network_name: "webserver_{{ user }}" + virtual_network_name: webserver_{{ user }} subnet: Webserver - resource_group: "webserver_{{ user }}" - domain_sub: "domain{{ user }}" + resource_group: webserver_{{ user }} + domain_sub: domain{{ user }} ssh_public_key: "{{lookup('file', '~/.ssh/id_rsa.pub') }}" tasks: @@ -16,76 +16,75 @@ azure.azcollection.azure_rm_virtualnetwork: resource_group: "{{ resource_group }}" name: "{{ virtual_network_name }}" - address_prefixes_cidr: "10.99.0.0/16" + address_prefixes_cidr: 10.99.0.0/16 tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a subnet azure.azcollection.azure_rm_subnet: resource_group: "{{ resource_group }}" virtual_network_name: "{{ virtual_network_name }}" name: "{{ subnet }}" - address_prefix_cidr: "10.99.0.0/24" - + address_prefix_cidr: 10.99.0.0/24 - name: Create a public ip address for webserver - azure_rm_publicipaddress: + register: webserver_pub_ip + azure.azcollection.azure_rm_publicipaddress: resource_group: "{{ resource_group }}" name: public_ip_webserver allocation_method: static - domain_name: "webserver{{ domain_sub }}" + domain_name: webserver{{ domain_sub }} tags: - solution: "webserver_{{ user }}" - delete: ansibletraining - register: webserver_pub_ip + solution: webserver_{{ user }} + delete: ansibletraining - name: Create Security Group for webserver - azure_rm_securitygroup: + azure.azcollection.azure_rm_securitygroup: resource_group: "{{ resource_group }}" - name: "webserver_securitygroup" + name: webserver_securitygroup purge_rules: true rules: - - name: Allow_SSH - protocol: Tcp - destination_port_range: 22 - access: Allow - priority: 100 - direction: Inbound - - name: Allow_HTTP - protocol: Tcp - destination_port_range: 80 - access: Allow - priority: 101 - direction: Inbound + - name: Allow_SSH + protocol: Tcp + destination_port_range: 22 + access: Allow + priority: 100 + direction: Inbound + - name: Allow_HTTP + protocol: Tcp + destination_port_range: 80 + access: Allow + priority: 101 + direction: Inbound tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a network interface for webserver - azure_rm_networkinterface: - name: "webserver_nic01" + azure.azcollection.azure_rm_networkinterface: + name: webserver_nic01 resource_group: "{{ resource_group }}" virtual_network: "{{ virtual_network_name }}" subnet_name: "{{ subnet }}" - security_group: "webserver_securitygroup" + security_group: webserver_securitygroup ip_configurations: - - name: "webserver_nic01_ipconfig" - public_ip_address_name: "public_ip_webserver" - primary: True + - name: webserver_nic01_ipconfig + public_ip_address_name: public_ip_webserver + primary: true tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a VM webserver - azure_rm_virtualmachine: + azure.azcollection.azure_rm_virtualmachine: resource_group: "{{ resource_group }}" - name: "webserver" + name: webserver os_type: Linux admin_username: "{{ user }}" ssh_password_enabled: false ssh_public_keys: - - path: "/home/{{ user }}/.ssh/authorized_keys" + - path: /home/{{ user }}/.ssh/authorized_keys key_data: "{{ ssh_public_key }}" managed_disk_type: Standard_LRS state: present @@ -95,13 +94,13 @@ sku: "8_4" version: latest vm_size: Standard_A1_v2 - network_interfaces: "webserver_nic01" + network_interfaces: webserver_nic01 tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Show webserver public ip - debug: + ansible.builtin.debug: msg: "{{ webserver_pub_ip.state.ip_address }}" - name: Wait for ssh on webserver @@ -112,4 +111,4 @@ timeout: 600 - name: Add webserver to ssh known_hosts - shell: "ssh-keyscan -t ecdsa {{ webserver_pub_ip.state.ip_address }} >> /home/{{ user }}/.ssh/known_hosts" + ansible.builtin.shell: ssh-keyscan -t ecdsa {{ webserver_pub_ip.state.ip_address }} >> /home/{{ user }}/.ssh/known_hosts diff --git a/02_azure_tower.yml b/02_azure_tower.yml index 1c43e52..712dfc5 100644 --- a/02_azure_tower.yml +++ b/02_azure_tower.yml @@ -5,87 +5,85 @@ vars: user: alex location: northeurope - virtual_network_name: "webserver_{{ user }}" + virtual_network_name: webserver_{{ user }} subnet: Webserver - resource_group: "webserver_{{ user }}" - domain_sub: "domain{{ user }}" - + resource_group: webserver_{{ user }} + domain_sub: domain{{ user }} tasks: - name: Create a virtual network azure.azcollection.azure_rm_virtualnetwork: resource_group: "{{ resource_group }}" name: "{{ virtual_network_name }}" - address_prefixes_cidr: "10.99.0.0/16" + address_prefixes_cidr: 10.99.0.0/16 tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a subnet azure.azcollection.azure_rm_subnet: resource_group: "{{ resource_group }}" virtual_network_name: "{{ virtual_network_name }}" name: "{{ subnet }}" - address_prefix_cidr: "10.99.0.0/24" - + address_prefix_cidr: 10.99.0.0/24 - name: Create a public ip address for webserver - azure_rm_publicipaddress: + register: webserver_pub_ip + azure.azcollection.azure_rm_publicipaddress: resource_group: "{{ resource_group }}" name: public_ip_webserver allocation_method: static - domain_name: "webserver{{ domain_sub }}" + domain_name: webserver{{ domain_sub }} tags: - solution: "webserver_{{ user }}" - delete: ansibletraining - register: webserver_pub_ip + solution: webserver_{{ user }} + delete: ansibletraining - name: Create Security Group for webserver - azure_rm_securitygroup: + azure.azcollection.azure_rm_securitygroup: resource_group: "{{ resource_group }}" - name: "webserver_securitygroup" + name: webserver_securitygroup purge_rules: true rules: - - name: Allow_SSH - protocol: Tcp - destination_port_range: 22 - access: Allow - priority: 100 - direction: Inbound - - name: Allow_HTTP - protocol: Tcp - destination_port_range: 80 - access: Allow - priority: 101 - direction: Inbound + - name: Allow_SSH + protocol: Tcp + destination_port_range: 22 + access: Allow + priority: 100 + direction: Inbound + - name: Allow_HTTP + protocol: Tcp + destination_port_range: 80 + access: Allow + priority: 101 + direction: Inbound tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a network interface for webserver - azure_rm_networkinterface: - name: "webserver_nic01" + azure.azcollection.azure_rm_networkinterface: + name: webserver_nic01 resource_group: "{{ resource_group }}" virtual_network: "{{ virtual_network_name }}" subnet_name: "{{ subnet }}" - security_group: "webserver_securitygroup" + security_group: webserver_securitygroup ip_configurations: - - name: "webserver_nic01_ipconfig" - public_ip_address_name: "public_ip_webserver" - primary: True + - name: webserver_nic01_ipconfig + public_ip_address_name: public_ip_webserver + primary: true tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Create a VM webserver - azure_rm_virtualmachine: + azure.azcollection.azure_rm_virtualmachine: resource_group: "{{ resource_group }}" - name: "webserver" + name: webserver os_type: Linux admin_username: "{{ user }}" ssh_password_enabled: false ssh_public_keys: - - path: "/home/{{ user }}/.ssh/authorized_keys" + - path: /home/{{ user }}/.ssh/authorized_keys key_data: "{{ ssh_public_key }}" managed_disk_type: Standard_LRS state: present @@ -95,13 +93,13 @@ sku: "8_4" version: latest vm_size: Standard_A1_v2 - network_interfaces: "webserver_nic01" + network_interfaces: webserver_nic01 tags: - solution: "webserver_{{ user }}" - delete: ansibletraining + solution: webserver_{{ user }} + delete: ansibletraining - name: Show webserver public ip - debug: + ansible.builtin.debug: msg: "{{ webserver_pub_ip.state.ip_address }}" - name: Wait for ssh on webserver diff --git a/02_domain.yml b/02_domain.yml index eaa3e34..5905e75 100644 --- a/02_domain.yml +++ b/02_domain.yml @@ -19,4 +19,4 @@ password: P@ssw0rd! state: present groups: - - corp + - corp diff --git a/02_loop.yml b/02_loop.yml index 772dc81..aa85bb5 100644 --- a/02_loop.yml +++ b/02_loop.yml @@ -8,13 +8,13 @@ ansible.builtin.file: path: /mnt/resource/ state: directory - mode: '0755' + mode: "0755" - name: Download files ansible.builtin.get_url: url: "{{ item }}" dest: /mnt/resource/ - mode: '0600' + mode: "0600" loop: - https://github.com/git-for-windows/git/releases/download/v2.30.0.windows.1/Git-2.30.0-64-bit.exe - https://www.python.org/ftp/python/3.8.7/python-3.8.7-embed-amd64.zip diff --git a/02_roles.yml b/02_roles.yml index d87881a..ecc229b 100644 --- a/02_roles.yml +++ b/02_roles.yml @@ -13,4 +13,4 @@ dest: /var/www/html/index.php owner: root group: root - mode: '0755' + mode: "0755" diff --git a/03_azure.yml b/03_azure.yml index 3836511..82a909b 100644 --- a/03_azure.yml +++ b/03_azure.yml @@ -7,8 +7,8 @@ tasks: - name: Delete resource group - azure_rm_resourcegroup: - name: "webserver_{{ user }}" + azure.azcollection.azure_rm_resourcegroup: + name: webserver_{{ user }} location: northeurope state: absent force_delete_nonempty: true diff --git a/roles/webserver/defaults/main.yml b/roles/webserver/defaults/main.yml index a6c9989..5da111e 100644 --- a/roles/webserver/defaults/main.yml +++ b/roles/webserver/defaults/main.yml @@ -1,9 +1,9 @@ --- # defaults file for webserver package: - - httpd - - mod_ssl - - openssl - - php - - php-gd - - php-mbstring + - httpd + - mod_ssl + - openssl + - php + - php-gd + - php-mbstring diff --git a/roles/webserver/meta/main.yml b/roles/webserver/meta/main.yml index 0cb6447..63c7b48 100644 --- a/roles/webserver/meta/main.yml +++ b/roles/webserver/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Alex description: a role for installing a webserver @@ -44,12 +45,12 @@ galaxy_info: - "8" galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. +# List tags for your role here, one per line. A tag is a keyword that describes +# and categorizes the role. Users find roles by searching for tags. Be sure to +# remove the '[]' above, if you add tags to this list. +# +# NOTE: A tag is limited to a single word comprised of alphanumeric characters. +# Maximum 20 tags per role. dependencies: [] # List your role dependencies here, one per line. Be sure to remove the '[]' above, diff --git a/webserver.azure_rm.yml b/webserver.azure_rm.yml index fe0a1ba..4053b68 100644 --- a/webserver.azure_rm.yml +++ b/webserver.azure_rm.yml @@ -1,7 +1,8 @@ +--- plugin: azure_rm auth_source: auto include_vm_resource_groups: - - '*' + - "*" keyed_groups: - prefix: tag key: tags