Skip to content

Commit

Permalink
Merge pull request #14 from ganto/role-deps
Browse files Browse the repository at this point in the history
Remove hard role dependency on debops.ferm
  • Loading branch information
ganto authored Jun 24, 2016
2 parents afcdef2 + e634add commit 0e2f885
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 47 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ into your playbook.
[Try DebOps now](https://github.com/debops/debops) for a complete solution to run your Debian-based infrastructure.


### Role dependencies

- `debops.ferm`




### Authors and license

`checkmk_server` role was written by:
Expand Down
8 changes: 0 additions & 8 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ checkmk_server__patches:
file: '/omd/versions/{{ checkmk_server__version_label }}/skel/etc/apache/conf.d/omd.conf'


# .. envvar:: checkmk_server__dependencies
#
# Enable execution of ``debops.checkmk_server`` role dependencies. This
# variable can be used in playbooks to disable hardcoded dependencies during
# transition to playbook-based ones.
checkmk_server__dependencies: True


# .. envvar:: checkmk_server__ferm_dependent_rules
#
# Firewall configuration using the ``debops.ferm`` Ansible role.
Expand Down
15 changes: 5 additions & 10 deletions docs/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,15 @@ Getting started
Example playbook
----------------

Here's an example playbook that uses the ``debops.checkmk_server`` role::
Here's an example playbook that uses the ``debops.checkmk_server`` role:

---

- name: Manage Check_MK server
hosts: [ 'debops_service_checkmk_server', 'debops_checkmk_server' ]
become: True

roles:
- role: debops.checkmk_server
tags: [ 'role::checkmk_server' ]
.. literalinclude:: playbooks/checkmk_server.yml
:language: yaml

This playbook will install the Check_MK server package along with its dependencies,
and configure a minimal monitoring service with default values generated by Ansible.
The inclusion of the ``debops.ferm`` is optional.


Ansible tags
------------
Expand Down
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Ansible role: debops.checkmk_server
:maxdepth: 2

introduction
installation
getting-started
defaults
defaults-configuration
Expand Down
14 changes: 0 additions & 14 deletions docs/installation.rst

This file was deleted.

8 changes: 8 additions & 0 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@ a powerful configuration language for creating check inventories.
.. _Check_MK: http://mathias-kettner.com/check_mk.html
.. _Nagios: https://www.nagios.org/
.. _Icinga: https://www.icinga.org/


Installation
~~~~~~~~~~~~

This role requires at least Ansible ``v2.0``. To install it, run::

ansible-galaxy install debops-contrib.checkmk_server
16 changes: 16 additions & 0 deletions docs/playbooks/checkmk_server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---

- name: Manage Check_MK server
hosts: [ 'debops_service_checkmk_server', 'debops_checkmk_server' ]
become: True

roles:

- role: debops.ferm
tags: [ 'depend::ferm', 'depend::ferm:checkmk_server', 'depend-of::checkmk_server', 'type::dependency' ]
ferm__dependent_rules:
- '{{ checkmk_server__ferm_dependent_rules }}'

- role: debops-contrib.checkmk_server
tags: [ 'role::checkmk_server' ]

8 changes: 1 addition & 7 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
---

dependencies:

- role: debops.ferm
tags: [ 'depend::ferm', 'depend::ferm:checkmk_server', 'depend-of::checkmk_server', 'type::dependency' ]
ferm__dependent_rules: '{{ checkmk_server__ferm_dependent_rules }}'
when: checkmk_server__dependencies | bool

dependencies: []

galaxy_info:

Expand Down

0 comments on commit 0e2f885

Please sign in to comment.