diff --git a/CHANGELOG.md b/CHANGELOG.md index 9372a0b..78c5b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ # Ansible Role for OpenSSH Server -## 2.7.0 - TBC +## 3.1.0 - TBC ### Major Changes +## 3.0.0 - 2019-05-20 + +### Major Changes + + - Upgrade minimal Ansible support to 2.8.0 + ## 2.6.0 - 2019-05-04 ### Major Changes diff --git a/README.md b/README.md index 9ea707e..3a80af1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Ansible Role for OpenSSH Server Management. ## Requirements -This role require Ansible 2.6 or higher. +This role require Ansible 2.8 or higher. This role was designed for Ubuntu 16.04/18.04 or RHEL/CentOS 7 or openSUSE Leap 15. @@ -23,7 +23,7 @@ This role was designed for Ubuntu 16.04/18.04 or RHEL/CentOS 7 or openSUSE Leap ## Example Playbook -[molecule/default/playbook.yml](molecule/default/playbook.yml) +[molecule/ubuntu-18.04/playbook.yml](molecule/ubuntu-18.04/playbook.yml) ## License diff --git a/meta/main.yml b/meta/main.yml index 937655c..ffb0332 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -20,7 +20,7 @@ galaxy_info: description: Ansible Role for OpenSSH Server Management company: PantaRei Design license: Apache License 2.0 - min_ansible_version: 2.6 + min_ansible_version: 2.8 platforms: - name: Ubuntu versions: diff --git a/molecule/centos-7/group_vars/all/main.yml b/molecule/centos-7/group_vars/all/main.yml new file mode 120000 index 0000000..796af02 --- /dev/null +++ b/molecule/centos-7/group_vars/all/main.yml @@ -0,0 +1 @@ +../../../../defaults/main.yml \ No newline at end of file diff --git a/molecule/suse-15/group_vars/all/main.yml b/molecule/suse-15/group_vars/all/main.yml new file mode 120000 index 0000000..796af02 --- /dev/null +++ b/molecule/suse-15/group_vars/all/main.yml @@ -0,0 +1 @@ +../../../../defaults/main.yml \ No newline at end of file diff --git a/molecule/ubuntu-16.04/group_vars/all/main.yml b/molecule/ubuntu-16.04/group_vars/all/main.yml new file mode 120000 index 0000000..796af02 --- /dev/null +++ b/molecule/ubuntu-16.04/group_vars/all/main.yml @@ -0,0 +1 @@ +../../../../defaults/main.yml \ No newline at end of file diff --git a/molecule/ubuntu-18.04/group_vars/all/main.yml b/molecule/ubuntu-18.04/group_vars/all/main.yml new file mode 120000 index 0000000..796af02 --- /dev/null +++ b/molecule/ubuntu-18.04/group_vars/all/main.yml @@ -0,0 +1 @@ +../../../../defaults/main.yml \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b7e6ecd..e89ee57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -ansible +ansible>=2.8.0 ansible-lint -molecule>=2.20.0.0a1 +flake8 +netaddr +testinfra>=3.0.4 yamllint +git+https://github.com/ansible/molecule.git@master#egg=molecule diff --git a/tasks/main.yml b/tasks/main.yml index 70717b1..0cb800d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,10 +23,11 @@ - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - "{{ ansible_distribution | lower }}.yml" - "{{ ansible_os_family | lower }}.yml" + - "main.yml" paths: "../vars" - skip: true loop_control: loop_var: "loop_var" + ignore_errors: true tags: sshd - name: include release specific tasks @@ -39,9 +40,9 @@ - "{{ ansible_distribution | lower }}.yml" - "{{ ansible_os_family | lower }}.yml" paths: "." - skip: true loop_control: loop_var: "loop_var" + ignore_errors: true tags: sshd - name: prepare directories