Skip to content
Snippets Groups Projects
Unverified Commit 36e5d742 authored by Arthur Outhenin-Chalandre's avatar Arthur Outhenin-Chalandre Committed by GitHub
Browse files

Resolve ansible-lint name errors (#10253)


* project: fix ansible-lint name

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: ignore jinja template error in names

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: capitalize ansible name

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: update notify after name capitalization

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

---------

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>
parent b9e38613
No related branches found
No related tags found
No related merge requests found
Showing
with 70 additions and 55 deletions
...@@ -22,18 +22,7 @@ skip_list: ...@@ -22,18 +22,7 @@ skip_list:
# (Disabled in Feb 2023) # (Disabled in Feb 2023)
- 'fqcn-builtins' - 'fqcn-builtins'
# names should start with an uppercase letter # We use template in names
# (Disabled in June 2023 after ansible upgrade; FIXME)
- 'name[casing]'
# Everything should be named
# (Disabled in June 2023 after ansible upgrade; FIXME)
- 'name[play]'
- 'name[missing]'
# templates should only be at the end of 'name'
# (Disabled in June 2023 after ansible upgrade; FIXME)
- 'name[jinja]'
- 'name[template]' - 'name[template]'
# order of keys errors # order of keys errors
......
--- ---
- hosts: localhost - name: Generate Azure inventory
hosts: localhost
gather_facts: False gather_facts: False
roles: roles:
- generate-inventory - generate-inventory
--- ---
- hosts: localhost - name: Generate Azure inventory
hosts: localhost
gather_facts: False gather_facts: False
roles: roles:
- generate-inventory_2 - generate-inventory_2
--- ---
- hosts: localhost - name: Generate Azure templates
hosts: localhost
gather_facts: False gather_facts: False
roles: roles:
- generate-templates - generate-templates
--- ---
- hosts: localhost - name: Create nodes as docker containers
hosts: localhost
gather_facts: False gather_facts: False
roles: roles:
- { role: dind-host } - { role: dind-host }
- hosts: containers - name: Customize each node containers
hosts: containers
roles: roles:
- { role: dind-cluster } - { role: dind-cluster }
--- ---
- name: set_fact distro_setup - name: Set_fact distro_setup
set_fact: set_fact:
distro_setup: "{{ distro_settings[node_distro] }}" distro_setup: "{{ distro_settings[node_distro] }}"
- name: set_fact other distro settings - name: Set_fact other distro settings
set_fact: set_fact:
distro_user: "{{ distro_setup['user'] }}" distro_user: "{{ distro_setup['user'] }}"
distro_ssh_service: "{{ distro_setup['ssh_service'] }}" distro_ssh_service: "{{ distro_setup['ssh_service'] }}"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
dest: "/etc/sudoers.d/{{ distro_user }}" dest: "/etc/sudoers.d/{{ distro_user }}"
mode: 0640 mode: 0640
- name: Add my pubkey to "{{ distro_user }}" user authorized keys - name: "Add my pubkey to {{ distro_user }} user authorized keys"
ansible.posix.authorized_key: ansible.posix.authorized_key:
user: "{{ distro_user }}" user: "{{ distro_user }}"
state: present state: present
......
--- ---
- name: set_fact distro_setup - name: Set_fact distro_setup
set_fact: set_fact:
distro_setup: "{{ distro_settings[node_distro] }}" distro_setup: "{{ distro_settings[node_distro] }}"
- name: set_fact other distro settings - name: Set_fact other distro settings
set_fact: set_fact:
distro_image: "{{ distro_setup['image'] }}" distro_image: "{{ distro_setup['image'] }}"
distro_init: "{{ distro_setup['init'] }}" distro_init: "{{ distro_setup['init'] }}"
......
--- ---
- hosts: localhost - name: Prepare Hypervisor to later install kubespray VMs
hosts: localhost
gather_facts: False gather_facts: False
become: yes become: yes
vars: vars:
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
- ntp - ntp
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
# Create deployment user if required - name: Create deployment user if required
- include_tasks: user.yml include_tasks: user.yml
when: k8s_deployment_user is defined when: k8s_deployment_user is defined
# Set proper sysctl values - name: Set proper sysctl values
- import_tasks: sysctl.yml import_tasks: sysctl.yml
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
- name: Check ansible version - name: Check ansible version
import_playbook: kubernetes_sigs.kubespray.ansible_version import_playbook: kubernetes_sigs.kubespray.ansible_version
- hosts: localhost - name: Install mitogen
hosts: localhost
strategy: linear strategy: linear
vars: vars:
mitogen_version: 0.3.2 mitogen_version: 0.3.2
...@@ -19,24 +20,24 @@ ...@@ -19,24 +20,24 @@
- "{{ playbook_dir }}/plugins/mitogen" - "{{ playbook_dir }}/plugins/mitogen"
- "{{ playbook_dir }}/dist" - "{{ playbook_dir }}/dist"
- name: download mitogen release - name: Download mitogen release
get_url: get_url:
url: "{{ mitogen_url }}" url: "{{ mitogen_url }}"
dest: "{{ playbook_dir }}/dist/mitogen_{{ mitogen_version }}.tar.gz" dest: "{{ playbook_dir }}/dist/mitogen_{{ mitogen_version }}.tar.gz"
validate_certs: true validate_certs: true
mode: 0644 mode: 0644
- name: extract archive - name: Extract archive
unarchive: unarchive:
src: "{{ playbook_dir }}/dist/mitogen_{{ mitogen_version }}.tar.gz" src: "{{ playbook_dir }}/dist/mitogen_{{ mitogen_version }}.tar.gz"
dest: "{{ playbook_dir }}/dist/" dest: "{{ playbook_dir }}/dist/"
- name: copy plugin - name: Copy plugin
ansible.posix.synchronize: ansible.posix.synchronize:
src: "{{ playbook_dir }}/dist/mitogen-{{ mitogen_version }}/" src: "{{ playbook_dir }}/dist/mitogen-{{ mitogen_version }}/"
dest: "{{ playbook_dir }}/plugins/mitogen" dest: "{{ playbook_dir }}/plugins/mitogen"
- name: add strategy to ansible.cfg - name: Add strategy to ansible.cfg
community.general.ini_file: community.general.ini_file:
path: ansible.cfg path: ansible.cfg
mode: 0644 mode: 0644
......
--- ---
- hosts: gfs-cluster - name: Bootstrap hosts
hosts: gfs-cluster
gather_facts: false gather_facts: false
vars: vars:
ansible_ssh_pipelining: false ansible_ssh_pipelining: false
roles: roles:
- { role: bootstrap-os, tags: bootstrap-os} - { role: bootstrap-os, tags: bootstrap-os}
- hosts: all - name: Gather facts
hosts: all
gather_facts: true gather_facts: true
- hosts: gfs-cluster - name: Install glusterfs server
hosts: gfs-cluster
vars: vars:
ansible_ssh_pipelining: true ansible_ssh_pipelining: true
roles: roles:
- { role: glusterfs/server } - { role: glusterfs/server }
- hosts: k8s_cluster - name: Install glusterfs servers
hosts: k8s_cluster
roles: roles:
- { role: glusterfs/client } - { role: glusterfs/client }
- hosts: kube_control_plane[0] - name: Configure Kubernetes to use glusterfs
hosts: kube_control_plane[0]
roles: roles:
- { role: kubernetes-pv } - { role: kubernetes-pv }
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
# hyperkube and needs to be installed as part of the system. # hyperkube and needs to be installed as part of the system.
# Setup/install tasks. # Setup/install tasks.
- include_tasks: setup-RedHat.yml - name: Setup RedHat distros for glusterfs
include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat' and groups['gfs-cluster'] is defined when: ansible_os_family == 'RedHat' and groups['gfs-cluster'] is defined
- include_tasks: setup-Debian.yml - name: Setup Debian distros for glusterfs
include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian' and groups['gfs-cluster'] is defined when: ansible_os_family == 'Debian' and groups['gfs-cluster'] is defined
- name: Ensure Gluster mount directories exist. - name: Ensure Gluster mount directories exist.
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
include_vars: "{{ ansible_os_family }}.yml" include_vars: "{{ ansible_os_family }}.yml"
# Install xfs package # Install xfs package
- name: install xfs Debian - name: Install xfs Debian
apt: apt:
name: xfsprogs name: xfsprogs
state: present state: present
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
- name: install xfs RedHat - name: Install xfs RedHat
package: package:
name: xfsprogs name: xfsprogs
state: present state: present
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
dev: "{{ disk_volume_device_1 }}" dev: "{{ disk_volume_device_1 }}"
# Mount external volumes # Mount external volumes
- name: mounting new xfs filesystem - name: Mounting new xfs filesystem
ansible.posix.mount: ansible.posix.mount:
name: "{{ gluster_volume_node_mount_dir }}" name: "{{ gluster_volume_node_mount_dir }}"
src: "{{ disk_volume_device_1 }}" src: "{{ disk_volume_device_1 }}"
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
state: mounted state: mounted
# Setup/install tasks. # Setup/install tasks.
- include_tasks: setup-RedHat.yml - name: Setup RedHat distros for glusterfs
include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- include_tasks: setup-Debian.yml - name: Setup Debian distros for glusterfs
include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: Ensure GlusterFS is started and enabled at boot. - name: Ensure GlusterFS is started and enabled at boot.
......
--- ---
- hosts: kube_control_plane[0] - name: Tear down heketi
hosts: kube_control_plane[0]
roles: roles:
- { role: tear-down } - { role: tear-down }
- hosts: heketi-node - name: Teardown disks in heketi
hosts: heketi-node
become: yes become: yes
roles: roles:
- { role: tear-down-disks } - { role: tear-down-disks }
--- ---
- hosts: heketi-node - name: Prepare heketi install
hosts: heketi-node
roles: roles:
- { role: prepare } - { role: prepare }
- hosts: kube_control_plane[0] - name: Provision heketi
hosts: kube_control_plane[0]
tags: tags:
- "provision" - "provision"
roles: roles:
......
--- ---
- name: "stop port forwarding" - name: "Stop port forwarding"
command: "killall " command: "killall "
--- ---
- hosts: localhost - name: Collect container images for offline deployment
hosts: localhost
become: no become: no
roles: roles:
...@@ -11,7 +12,8 @@ ...@@ -11,7 +12,8 @@
tasks: tasks:
# Generate files.list and images.list files from templates. # Generate files.list and images.list files from templates.
- template: - name: Collect container images for offline deployment
template:
src: ./contrib/offline/temp/{{ item }}.list.template src: ./contrib/offline/temp/{{ item }}.list.template
dest: ./contrib/offline/temp/{{ item }}.list dest: ./contrib/offline/temp/{{ item }}.list
mode: 0644 mode: 0644
......
--- ---
- hosts: all - name: Disable firewalld/ufw
hosts: all
roles: roles:
- { role: prepare } - { role: prepare }
--- ---
- block: - name: Disable firewalld and ufw
block:
- name: List services - name: List services
service_facts: service_facts:
......
--- ---
- hosts: kube_node:kube_control_plane - name: Remove old cloud provider config
hosts: kube_node:kube_control_plane
tasks: tasks:
- name: Remove old cloud provider config - name: Remove old cloud provider config
file: file:
...@@ -7,7 +8,8 @@ ...@@ -7,7 +8,8 @@
state: absent state: absent
with_items: with_items:
- /etc/kubernetes/cloud_config - /etc/kubernetes/cloud_config
- hosts: kube_control_plane[0] - name: Migrate intree Cinder PV
hosts: kube_control_plane[0]
tasks: tasks:
- name: Include kubespray-default variables - name: Include kubespray-default variables
include_vars: ../roles/kubespray-defaults/defaults/main.yaml include_vars: ../roles/kubespray-defaults/defaults/main.yaml
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment