Update to work with Debian 11
- Add acl package
- Fix galaxy metadata
Change-Id: I0781d0e30f7a20e30525640f6adf1fbd46e64b55
diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 931ab2b..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit.opencord.org
-port=29418
-project=ansible/role/acme.git
-defaultremote=origin
diff --git a/.reuse/dep5 b/.reuse/dep5
index 36ce305..1fed8b9 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -1,5 +1,5 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Files: .cookiecutter_params.json VERSION .gitreview
+Files: .cookiecutter_params.json VERSION README.md
Copyright: 2020 Open Networking Foundation
License: Apache-2.0
diff --git a/Makefile b/Makefile
index 861d38b..7ea7b68 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,13 @@
-d "{extends: default, rules: {line-length: {max: 99}}}" \
-s $(YAML_FILES)
+# List of molecule files, not including base molecule.yml which isn't ansible format
+MOLECULE_FILES ?= $(shell find molecule -type f -name '*.yml' \! -name 'molecule.yml' -print )
+
ansiblelint: ## lint check with ansible-lint
ansible-lint --version
ansible-lint -v .
- ansible-lint -v molecule/*/*
+ ansible-lint -v $(MOLECULE_FILES)
license: ## Check license with the reuse tool
reuse --version
diff --git a/README.md b/README.md
index e300730..a92ea1b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-<!--
-SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
-SPDX-License-Identifier: Apache-2.0
---!>
# acme
[acme.sh](https://github.com/acmesh-official/acme.sh) shell-script ACME client
diff --git a/meta/main.yml b/meta/main.yml
index a3703de..1e9b80a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -5,6 +5,9 @@
# SPDX-License-Identifier: Apache-2.0
galaxy_info:
+ role_name: acme
+ namespace: onf
+
author: Open Networking Foundation
description: acme.sh protocol client for certificate renewals
company: Open Networking Foundation
@@ -13,15 +16,18 @@
license: Apache-2.0
- min_ansible_version: 2.9.5
+ min_ansible_version: 2.10.17
platforms:
- - name: Ubuntu
+ - name: ubuntu
versions:
- - "16.04"
- - "18.04"
+ - bionic
+ - name: Debian
+ versions:
+ - bullseye
galaxy_tags:
- acme
+ - letsencrypt
dependencies: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 2052958..19441a7 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,6 +14,11 @@
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+ - name: "debian-11-priv"
+ image: "onfinfra/molecule-systemd:debian-11"
+ privileged: true
+ volumes:
+ - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
provisioner:
name: ansible
verifier:
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 6329015..82dfeb3 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -7,6 +7,7 @@
- name: Install tools required for acme.sh
apt:
name:
+ - acl # needed for ansible to run commands as acme user
- curl
- git
- openssl