Просмотр исходного кода

Merge pull request #134 from jaredledvina/feature/update-metadata-to-match-automated-tests

Feature/update metadata to match automated tests
Jared 8 лет назад
Родитель
Сommit
4e46f04ad2
2 измененных файлов с 20 добавлено и 114 удалено
  1. 17 12
      README.md
  2. 3 102
      meta/main.yml

+ 17 - 12
README.md

@@ -22,24 +22,25 @@ However, if you want to rely on other roles/management methods to deploy/manage
 
 ## Requirements
 This role requires:
-- Ansible 2.0
+- A supported version of Ansible, see [Ansible version support](#ansible-version-support) for details.
 - The `dynamic_data_store` variable to be set: see [Dynamic Data Store](http://ansible-sensu.readthedocs.io/en/latest/dynamic_data/)
 - If `sensu_include_plugins` is true (the default), the `static_data_store` variable needs to be set: see [Check Deployment](http://ansible-sensu.readthedocs.io/en/latest/dynamic_checks/)
 
 ## Supported Platforms
 ### Current Release
+#### Automatically tested via TravisCI
 
-- [SmartOS - base-64 15.x.x](https://docs.joyent.com/images/smartos/base#version-15xx)
 - [CentOS - 7](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7)
 - [Amazon Linux](https://aws.amazon.com/amazon-linux-ami/) - only client side support is tested
 - [Debian - 8 (Jessie)](https://wiki.debian.org/DebianJessie)
+- [Debian - 9 (Stretch)](https://wiki.debian.org/DebianStretch)
+- [Ubuntu - 14.04 (Trusty Tahr)](http://releases.ubuntu.com/14.04/)
 - [Ubuntu - 16.04 (Xenial Xerus)](http://releases.ubuntu.com/16.04/)
-- [FreeBSD - 10.3, 11.0 (64-bit only)](https://www.freebsd.org/releases/10.2R/relnotes.html)
 
-### Future Releases
-
-- OpenBSD
-- NetBSD
+#### Supported manually (compatibility not always guaranteed)
+- [SmartOS - base-64 15.x.x](https://docs.joyent.com/images/smartos/base#version-15xx)
+- [FreeBSD - 10.3, 11.0 (64-bit only)](https://www.freebsd.org/releases/10.2R/relnotes.html)
+- [OpenBSD - 6.2](https://www.openbsd.org/62.html)
 
 ## Role Variables
 
@@ -60,18 +61,22 @@ Or, passing parameter values:
       - { role: cmacrae.sensu, sensu_master: true, sensu_include_dashboard: true  }
 ```
 
+## Ansible version support
+All changes to this role are actively tested with the last two stable versions of Ansible to ensure compatibility. As such, this role
+only officially supports running with the last two stable releases of Ansible, which aligns with the [Ansible support model](http://docs.ansible.com/ansible/latest/release_and_maintenance.html#release-status).
+
+
 License
 -------
 MIT
 
 Author Information
 ------------------
-Created by [Calum MacRae](http://cmacr.ae)
+Originally created by [Calum MacRae](http://cmacr.ae) and supported by the [Sensu Community Ansible Maintainers](https://github.com/sensu-plugins/community/#maintained-areas)
 
 ### Contributors
-Stephen Muth - ([@smuth4](https://github.com/smuth4))
+See the projects [Contributors page](https://github.com/sensu/sensu-ansible/graphs/contributors)
 
 Feel free to:
-Contact me - [@calumacrae](https://twitter.com/calumacrae), [mailto:calum0macrae@gmail.com](calum0macrae@gmail.com)
-[Raise an issue](https://github.com/cmacrae/ansible-sensu/issues)
-[Contribute](https://github.com/cmacrae/ansible-sensu/pulls)
+[Raise an issue](https://github.com/sensu/sensu-ansible/issues)
+[Contribute](https://github.com/sensu/sensu-ansible/pulls)

+ 3 - 102
meta/main.yml

@@ -2,115 +2,19 @@ galaxy_info:
   author: Calum MacRae
   description: Deploy a full Sensu monitoring stack; including redis, RabbitMQ & the Uchiwa dashboard
   license: MIT
-  min_ansible_version: 2.0
+  min_ansible_version: 2.3
   platforms:
   - name: EL
     versions:
-  #  - all
-  #  - 5
-  #  - 6
     - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  - name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  # - name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  - name: FreeBSD
-    versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-    - 10.2
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
   - name: Ubuntu
     versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
+    - trusty
     - vivid
-  #  - wily
-  #  - xenial
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
   - name: Debian
     versions:
-  #  - all
-  #  - etch
     - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
+    - stretch
 
   galaxy_tags:
     - cloud
@@ -126,6 +30,3 @@ galaxy_info:
     - stack
     - dashboard
 dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.