Merge pull request #157 from evrardjp/cleanup

Modernize role

Author: evrardjp

.ansible-lint

@@ -0,0 +1,7 @@
+# Rule 106 was added long after this role has been created.
+# The ansible-lint removes the prefix "ansible-role-*" for this test, and not the "ansible-" prefix.
+# Any role in the form of "ansible-*" is broken with this in.
+# Instead of renaming my role and breaking the world, I will just ignore that lint test.
+skip_list:
+  - '106' # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern
+

.github/workflows/molecule.yml

@@ -0,0 +1,19 @@
+---
+name: Molecule Test
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 2
+      matrix:
+        ansible: ["2.9", "latest"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt remove ansible
+          sudo apt install tox
+      - name: Test with molecule using tox
+        run: |
+          sudo -H -E tox -e ansible-${{ matrix.ansible }}

.yamllint

@@ -0,0 +1,35 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable
+ignore:
+  .tox/

README.md

@@ -8,6 +8,13 @@ Requirements
 
 No fancy requirements. Only package and file management in the role.
 
+Starting with this role version 4.0.0, the following minimum OS versions are required:
+- Ubuntu: 15.04 or above
+- Debian: Jessie or above
+- CentOS: 7 or above
+
+For older OSes, please use a previous version of this role.
+
 Role Variables
 --------------
 
@@ -23,6 +30,8 @@ The main variables are:
 * keepalived_bind_on_non_local: This variable (defaulted to "False") determines whether the system that host keepalived will allow its apps to bind on non-local addresses. If you set it to true, this allows apps to bind (and start) even if they don't currently have the VIP for example.
 
 Please check the examples for more explanations on how these dicts must be configured.
+You can find an example playbook in this README, and other examples in `tests/`, including
+examples on the variables configuration.
 
 Other editable variables are listed in the defaults/main.yml. Please read the explanation there if you want to override them.
 An example of a notification script is also given, in the files folder.

Vagrantfile

@@ -13,31 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# keepalived_ubuntu_src should be either "uca", "ppa" or "native":
-# "ppa" will ensure that keepalived ppa source is installed (recommended)
-# "uca" will ensure that the Ubuntu Cloud Archive is installed (good enough)
-# "native" will not ensure any external repository is set
-#  and use what's available (not recommended, unless you defined one of the
-#  above on your hosts)
-# Please see vars/ for information about these repositories
-# TODO(evrardjp), 2017-11:to remove the conditional
-# Remove the deprecation conditional and provide a good unconditional
-# default:
-#keepalived_ubuntu_src: "uca"
-keepalived_ubuntu_src: "{{ (keepalived_uca_enable is defined and (keepalived_uca_enable | bool)) | ternary('uca','ppa') }}"
-
-# If using UCA, you may want to point with your local mirror of UCA.
-keepalived_uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-
 # If running keepalived with SELinux, you could need to compile your
 # rules. Please override this list with path to files to compile.
 keepalived_selinux_compile_rules:
   - keepalived_ping
   - keepalived_setpgid
 
-# TODO(evrardjp), 2017-11:
-# Remove the deprecation conditional and provide a good unconditional
-# default:
 #keepalived_package_state: "latest"
 keepalived_package_state: "{{ ( (keepalived_use_latest_stable | default(true)) | bool) | ternary('latest','present') }}"
 
@@ -61,7 +42,7 @@ keepalived_bind_on_non_local: False
 # After=network-online.target
 keepalived_systemd_overrides: True
 
-# Whether to add systemd option Restart=allways
+# Whether to add systemd option Restart=always
 # It depends on bool keepalived_systemd_overrides, so to add both must be True
 keepalived_systemd_override_service_restart: False
 

defaults/main.yml

@@ -17,7 +17,7 @@
 # backported to previous branches, we should rely on command to do service reload
 # else, testing is broken.
 - name: restart keepalived
-  shell: "systemctl restart {{ keepalived_service_name }} || service {{ keepalived_service_name }} restart"
+  command: "systemctl restart {{ keepalived_service_name }}"
   tags:
     - skip_ansible_lint
 #- name: restart keepalived

handlers/main.yml

@@ -1,38 +1,39 @@
----
-# Copyright 2015, Jean-Philippe Evrard <[email protected]>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-galaxy_info:
-  author: Jean-Philippe Evrard
-  description:  This role installs and configure keepalived based on a variable file
-  license: Apache
-  min_ansible_version: 2.4
-  platforms:
-  - name: EL
-    versions:
-    - 7
-    - 8
-  - name: Ubuntu
-    versions:
-    - trusty
-    - xenial
-  - name: opensuse
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - stretch
-  galaxy_tags:
-  - clustering
-dependencies: []
+---
+# Copyright 2015, Jean-Philippe Evrard <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+galaxy_info:
+  author: Jean-Philippe Evrard
+  description:  This role installs and configure keepalived based on a variable file
+  license: Apache
+  min_ansible_version: 2.4
+  platforms:
+  - name: EL
+    versions:
+    - 7
+    - 8
+  - name: Ubuntu
+    versions:
+    - xenial
+    - bionic
+    - focal
+  - name: opensuse
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - stretch
+  galaxy_tags:
+  - clustering
+dependencies: []

meta/main.yml

@@ -0,0 +1 @@
+{{ lookup('url', 'https://raw.githubusercontent.com/ericsysmin/docker-ansible-testing/master/' ~ item.image ~ '/Dockerfile', split_lines=False) }}

molecule/default/Dockerfile.j2

@@ -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: keepalived-network
+      state: absent