Merge pull request #3 from noonedeadpunk/ci

Dmitriy Rabotyagov · web-flow · commit 765c9eae8765 · 2021-01-13T16:00:21.000+02:00
Add CI tests
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+---
+os: linux
+dist: bionic
+language: python
+services:
+  - docker
+
+install:
+  - pip install -r requirements.txt
+
+script:
+  - molecule --version
+  - ansible --version
+  - molecule test -s default
diff --git a/.yamllint.yml b/.yamllint.yml
@@ -0,0 +1,10 @@
+---
+rules:
+  truthy:
+    allowed-values:
+      - 'True'
+      - 'true'
+      - 'yes'
+      - 'False'
+      - 'false'
+      - 'no'
diff --git a/README.md b/README.md
@@ -1,11 +1,12 @@
 ansible-pacemaker-corosync role
 ===============================
 
-Deploys corosync/pacemaker
+Deploys corosync/pacemaker [![Build Status](https://travis-ci.org/noonedeadpunk/ansible-pacemaker-corosync.svg?branch=master)](https://travis-ci.org/noonedeadpunk/ansible-pacemaker-corosync)
 
 # Variables
 
 - `pacemaker_corosync_group`: Ansible group name for corosync cluster (default: false, *mandatory*)
 - `pacemaker_remote_group`: Ansible group name for pacemaker-remote cluster (default: false, *mandatory*)
 - `pacemaker_corosync_ring_interface`: Interface to use for ring0 communications (default: false, *mandatory*)
+- `pacemaker_remote_ring_interface`: Interface to use for ring0 communications on remote hosts (default: pacemaker_corosync_ring_interface)
 - `pacemaker_corosync_fqdn`: Whether use inventory_hostname or ansible_fqdn as node name for corosync (default: false)
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,5 +1,15 @@
+---
+
 pacemaker_corosync_fqdn: false
 pacemaker_corosync_group: false
+pacemaker_remote_group: false
 pacemaker_corosync_ring_interface: false
+pacemaker_remote_ring_interface: "{{ pacemaker_corosync_ring_interface }}"
 pacemaker_corosync_use_syslog: true
 pacemaker_corosync_use_logfile: false
+
+
+# Centos EPEL repository options (for haveged)
+pacemaker_corosync_haveged_enabled: True
+pacemaker_corosync_centos_epel_mirror: "{{ centos_epel_mirror | default('http://download.fedoraproject.org/pub/epel') }}"
+pacemaker_corosync_centos_epel_key: "{{ centos_epel_key | default('http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-' ~ ansible_distribution_major_version) }}"
diff --git a/meta/main.yml b/meta/main.yml
@@ -9,8 +9,8 @@ galaxy_info:
   license: MIT
   min_ansible_version: 1.6
   platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  categories:
-  - system
+    - name: Ubuntu
+      versions:
+        - all
+  galaxy_tags:
+    - system
diff --git a/molecule/default/cleanup.yml b/molecule/default/cleanup.yml
@@ -0,0 +1,10 @@
+---
+- name: Prepare molecule instance
+  hosts: all[0]
+  gather_facts: no
+  tasks:
+  - name: Create a network with custom IPAM config
+    delegate_to: localhost
+    community.general.docker_network:
+      name: pacemaker-network
+      state: absent
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -0,0 +1,44 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+  - name: Apt update and install rsync, ping, iproute
+    apt:
+      update_cache: yes
+      name:
+        - rsync
+        - inetutils-ping
+        - iproute2
+      state: present
+    when: ansible_os_family == "Debian"
+
+  - name: Yum install iproute to fix undefined ansible_default_ipv4.address
+    yum:
+      name: iproute
+      state: present
+    when:
+      - ansible_distribution == "CentOS"
+      - ansible_distribution_major_version == "7"
+
+  - name: Add a container to a network, leaving existing containers connected
+    delegate_to: localhost
+    community.general.docker_network:
+      name: pacemaker-network
+      connected:
+        - "{{ inventory_hostname }}"
+      appends: yes
+
+  - name: Re-collect network facts required after installation iproute
+    setup:
+      gather_subset: network
+
+  - name: Show ansible_interfaces
+    debug:
+      var: ansible_interfaces
+
+  - name: Include keepalived vars
+    include_vars: "tests/pacemaker_corosync_local.yml"
+
+  - name: "Include ansible-pacemaker-corosync"
+    include_role:
+      name: "ansible-pacemaker-corosync"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -0,0 +1,48 @@
+---
+lint: |
+  set -e
+  yamllint .
+  ansible-lint -vv --exclude=.tox -x 204,208,106
+dependency:
+  name: galaxy
+driver:
+  name: docker
+verifier:
+  name: ansible
+provisioner:
+  name: ansible
+  options:
+    v: True
+  log: True
+platforms:
+  - name: pacemaker-centos7
+    image: diodonfrost/ansible-centos:7
+    groups:
+      - corosync
+    privileged: true
+    volumes:
+    - /sys/fs/cgroup:/sys/fs/cgroup:ro
+
+  - name: pacemaker-centos8
+    image: diodonfrost/ansible-centos:8
+    groups:
+      - corosync
+    privileged: true
+    volumes:
+    - /sys/fs/cgroup:/sys/fs/cgroup:ro
+
+  - name: pacemaker-bionic
+    image: travisci/ubuntu-systemd:18.04
+    groups:
+      - corosync
+    privileged: true
+    volumes:
+    - /sys/fs/cgroup:/sys/fs/cgroup:ro
+
+  - name: pacemaker-focal
+    image: travisci/ubuntu-systemd:20.04
+    privileged: true
+    groups:
+      - corosync
+    volumes:
+    - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -0,0 +1,12 @@
+---
+- name: Prepare molecule instance
+  hosts: all[0]
+  tasks:
+  - name: Create a network with custom IPAM config
+    delegate_to: localhost
+    community.general.docker_network:
+      name: pacemaker-network
+      ipam_config:
+        - subnet: 192.168.33.0/24
+          gateway: 192.168.33.254
+          iprange: 192.168.33.0/26
diff --git a/molecule/default/tests/pacemaker_corosync_local.yml b/molecule/default/tests/pacemaker_corosync_local.yml
@@ -0,0 +1,4 @@
+---
+
+pacemaker_corosync_group: corosync
+pacemaker_corosync_ring_interface: eth1
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,4 @@
+ansible==2.10.5
+docker==4.4.1
+molecule[docker]==3.2.2
+ansible-lint==4.3.7
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,2 +1,4 @@
+---
+
 - include: check_vars.yml tags=pacemaker,check
 - include: pacemaker.yml tags=pacemaker
diff --git a/tasks/pacemaker.yml b/tasks/pacemaker.yml
@@ -1,6 +1,10 @@
+---
+
 - name: Enable HighAvailability repository
-  command: yum-config-manager --enable ha
+  command: dnf config-manager --enable ha
   changed_when: false
+  args:
+    warn: false
   when:
     - ansible_os_family | lower == 'redhat'
     - ansible_distribution_major_version is version('8', '=')
@@ -26,13 +30,48 @@
     state: present
   with_items:
     - pacemaker-remote
-  when: "inventory_hostname in groups[pacemaker_remote_group]"
+  when:
+    - _pacemaker_remote_group_exists
+    - "inventory_hostname in groups[pacemaker_remote_group]"
+
+- name: Install EPEL repo for CentOS
+  block:
+    - name: Download EPEL gpg keys
+      get_url:
+        url: "{{ pacemaker_corosync_centos_epel_key }}"
+        dest: /etc/pki/rpm-gpg
+      register: _get_yum_keys
+      until: _get_yum_keys is success
+      retries: 5
+      delay: 2
+
+    - name: Install EPEL gpg keys
+      rpm_key:
+        key: "/etc/pki/rpm-gpg/{{ pacemaker_corosync_centos_epel_key.split('/')[-1] }}"
+        state: present
+
+    - name: Install the EPEL repository
+      yum_repository:
+        name: epel-haveged
+        baseurl: "{{ pacemaker_corosync_centos_epel_mirror ~ '/' ~ ansible_distribution_major_version ~ (ansible_distribution_major_version is version('8', '>=')) | ternary('/Everything/', '/') ~ ansible_architecture }}"
+        description: 'Extra Packages for Enterprise Linux {{ ansible_distribution_major_version }} - $basearch'
+        gpgcheck: yes
+        enabled: yes
+        state: present
+        includepkgs: "haveged"
+      register: install_epel_repo
+      until: install_epel_repo is success
+      retries: 5
+      delay: 2
+  when:
+    - pacemaker_corosync_haveged_enabled | bool
+    - ansible_os_family | lower == 'redhat'
 
 - name: Install haveged
   package:
     name: haveged
     state: present
-  when: haveged_enabled | default(True) | bool
+  when: pacemaker_corosync_haveged_enabled | bool
 
 - name: Generates corosync key
   become: true
@@ -41,15 +80,15 @@
   args:
     creates: /etc/corosync/authkey
   when: inventory_hostname == groups[pacemaker_corosync_group][0]
-  register: __corosync_authkey_created
   notify: Restart corosync
 
-- name: Generate tmpdir for authkey
-  local_action:
-    module: tempfile
+- name: Generate tmpfile for authkey
+  tempfile:
+    state: file
   register: authkey_tempfile
   changed_when: False
   check_mode: no
+  delegate_to: localhost
   when: inventory_hostname != groups[pacemaker_corosync_group][0]
 
 - name: Fetch authkey for other nodes
@@ -71,12 +110,12 @@
   notify: Restart corosync
 
 - name: Clean up tmpdir
-  local_action:
-    module: file
+  file:
     path: "{{ authkey_tempfile.path }}"
     state: "absent"
   changed_when: False
   check_mode: no
+  delegate_to: localhost
   when: inventory_hostname != groups[pacemaker_corosync_group][0]
 
 - name: Chowns authkeys
@@ -123,7 +162,7 @@
 
 - name: Adds ferm filtering
   template:
-    src: "../templates/ferm.j2"
+    src: "ferm.j2"
     dest: /etc/ferm/filter-input.d/60_corosync.conf
   when: ferm_enabled | default(false)
   tags: ferm
diff --git a/templates/corosync.conf.j2 b/templates/corosync.conf.j2
@@ -1,8 +1,8 @@
-{%  if inventory_hostname in groups[pacemaker_corosync_group] %}
-{%    set _pacemaker_corosync_bind_addr = hostvars[inventory_hostname]['ansible_eth1' | replace('-', '_')].ipv4.address %}
-{% else %}
-{%    set _pacemaker_corosync_bind_addr = hostvars[inventory_hostname]['ansible_' + pacemaker_corosync_ring_interface | replace('-', '_')].ipv4.address %}
-{%  endif %}
+{% if inventory_hostname in groups[pacemaker_corosync_group] %}
+{%   set _pacemaker_corosync_bind_addr = hostvars[inventory_hostname]['ansible_' + pacemaker_corosync_ring_interface | replace('-', '_')].ipv4.address %}
+{% elif  pacemaker_remote_group in groups and inventory_hostname in groups[pacemaker_remote_group] %}
+{%   set _pacemaker_corosync_bind_addr = hostvars[inventory_hostname]['ansible_' + pacemaker_remote_ring_interface | replace('-', '_')].ipv4.address %}
+{% endif %}
 
 totem {
   version: 2
@@ -34,14 +34,14 @@ quorum {
 {% if pacemaker_enable_nodelist|default(true) %}
 nodelist {
 
-{% for node in groups[pacemaker_remote_group]|sort + groups[pacemaker_corosync_group]|sort %}
+{% for node in (_pacemaker_remote_group_exists | ternary(groups[pacemaker_remote_group], []) + groups[pacemaker_corosync_group]) | sort %}
 {%  if node in groups[pacemaker_corosync_group] %}
-{%    set _tmp_pacemaker_corosync_ring_interface = 'eth1' %}
-{% else %}
-{%    set _tmp_pacemaker_corosync_ring_interface = pacemaker_corosync_ring_interface %}
+{%    set _pacemaker_corosync_ring_interface = pacemaker_corosync_ring_interface %}
+{% elif pacemaker_remote_group in groups and inventory_hostname in groups[pacemaker_remote_group] %}
+{%    set _pacemaker_corosync_ring_interface = pacemaker_remote_ring_interface %}
 {%  endif %}
   node {
-    ring0_addr: {{ hostvars[node]['ansible_' + _tmp_pacemaker_corosync_ring_interface | replace('-', '_')].ipv4.address }}
+    ring0_addr: {{ hostvars[node]['ansible_' + _pacemaker_corosync_ring_interface | replace('-', '_')].ipv4.address }}
     name: {{ pacemaker_corosync_fqdn | bool | ternary(hostvars[node].ansible_fqdn, node) }}
     nodeid: {{ loop.index }}
   }
diff --git a/vars/main.yml b/vars/main.yml
@@ -0,0 +1,3 @@
+---
+
+_pacemaker_remote_group_exists: "{{ (pacemaker_remote_group is defined and pacemaker_remote_group in groups) }}"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,10 @@ @@
 +---
 +rules:
 +  truthy:
 +    allowed-values:
 +      - 'True'
 +      - 'true'
 +      - 'yes'
 +      - 'False'
 +      - 'false'
 +      - 'no'