Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed May 20, 2019
2 parents 91ea83a + 425dc45 commit 085b475
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 8 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions molecule/centos-7/group_vars/all/main.yml
1 change: 1 addition & 0 deletions molecule/suse-15/group_vars/all/main.yml
1 change: 1 addition & 0 deletions molecule/ubuntu-16.04/group_vars/all/main.yml
1 change: 1 addition & 0 deletions molecule/ubuntu-18.04/group_vars/all/main.yml
7 changes: 5 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 085b475

Please sign in to comment.