Commit 19a99f70 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example 

# Conflicts:
#	README.rst
#	defaults/main.yml
#	handlers/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
#	vars/main.yml
parents bf50f707 41ad1da6

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    -   id: check-merge-conflict

    -   id: flake8

    -   id: check-symlinks

-   repo: https://www.shore.co.il/git/ansible-pre-commit

-   repo: https://github.com/adarnimrod/ansible-pre-commit.git

    sha: 0fadd691465b97db8992cfc66650f630e433324b

    hooks:

    -   id: ansible-syntax-check

.travis.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
---

language: python

python: "2.7"

dist: trusty

sudo: false

group: beta

services: [docker]

cache:

  - pip

  - directories:

      - $HOME/.pre-commit



install:

  - pip install -r tests/requirements.txt | cat

  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

  - molecule dependency



script:

  - pre-commit run --all-files

  - molecule test --driver docker



notifications:

  webhooks: https://galaxy.ansible.com/api/v1/notifications/

  email: false

README.rst

+11 −8
Original line number Diff line number Diff line 
NSD

###



Provision NSD authorative DNS server. By default the role has minimal

.. image:: https://travis-ci.org/adarnimrod/nsd.svg?branch=master

    :target: https://travis-ci.org/adarnimrod/nsd



Provision an NSD authorative DNS server. By default the role has minimal

configuration. You can add your own by overriding the default

:code:`nsd_config` dictionary with your own for configuration under the

:code:`server` block in :code:`nsd.conf`. For other blocks that can declared
@@ -14,8 +17,7 @@ playbook). 
Requirements

------------



See :code:`meta/main.yml`, :code:`tests/requirements.yml` and assertions at

the top of :code:`tasks/main.yml`.

See :code:`meta/main.yml` and assertions at the top of :code:`tasks/main.yml`.



Role Variables

--------------
@@ -35,21 +37,22 @@ See :code:`tests/playbook.yml`. 
Testing

-------



Testing requires Virtualbox and Vagrant and Python 2.7. Install the Python

dependencies, add pre-commit hooks by running:

Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.

Install the Python dependencies, dependent roles and roles required for

testing:



.. code:: shell



    pip install -r tests/requirements.txt

    pre-commit install

    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

    molecule dependency



To run the full test suite:



.. code:: shell



    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

    molecule test --platform all

    pre-commit run --all-files

    molecule test --platform all



License

-------

ansible.cfg

+2 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
library = library

host_key_checking = False

retry_files_enabled = False

roles_path = .molecule/roles:.molecule/../roles:../:../../

roles_path = ../:.molecule/roles:.molecule/../roles:../../

command_warnings = True

deprecation_warnings = True

callback_whitelist = profile_tasks



[ssh_connection]

pipelining = True

defaults/main.yml

+1 −1
Original line number Diff line number Diff line 
---

# defaults file for ansible-role-nsd

# defaults file for nsd



nsd_mail_alias: root # Where to send mail for the NSD user.

nsd_config: # key/value configuration under the server block, for more