feat(semantic-release): implement an automated changelog
This commit is contained in:
Nicolas Rodriguez
parent
ad8e0f6a28
commit
51f872ed39
|
|
@ -0,0 +1,110 @@
|
|||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
env/
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a packager
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
pip-delete-this-directory.txt
|
||||
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
.hypothesis/
|
||||
.kitchen
|
||||
.kitchen.local.yml
|
||||
kitchen.local.yml
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# PyBuilder
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# pyenv
|
||||
.python-version
|
||||
|
||||
# celery beat schedule file
|
||||
celerybeat-schedule
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# dotenv
|
||||
.env
|
||||
|
||||
# virtualenv
|
||||
.venv
|
||||
venv/
|
||||
ENV/
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
|
||||
# Bundler
|
||||
Gemfile.lock
|
||||
|
||||
# copied `.md` files used for conversion to `.rst` using `m2r`
|
||||
docs/*.md
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
stages:
|
||||
- test
|
||||
- commitlint
|
||||
- name: release
|
||||
if: branch = master AND type != pull_request
|
||||
|
||||
sudo: required
|
||||
cache: bundler
|
||||
language: ruby
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- ipvsadm
|
||||
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
env:
|
||||
matrix:
|
||||
- INSTANCE: default-debian-9-2019-2-py3
|
||||
- INSTANCE: default-ubuntu-1804-2019-2-py3
|
||||
- INSTANCE: default-centos-7-2019-2-py3
|
||||
- INSTANCE: default-fedora-29-2019-2-py3
|
||||
- INSTANCE: default-opensuse-leap-15-2019-2-py3
|
||||
- INSTANCE: default-debian-9-2018-3-py2
|
||||
- INSTANCE: default-ubuntu-1604-2018-3-py2
|
||||
- INSTANCE: default-centos-7-2018-3-py2
|
||||
- INSTANCE: default-fedora-29-2018-3-py2
|
||||
# TODO: Use this when fixed instead of `opensuse-leap-42`
|
||||
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
|
||||
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
|
||||
- INSTANCE: default-opensuse-leap-42-2018-3-py2
|
||||
- INSTANCE: default-debian-8-2017-7-py2
|
||||
- INSTANCE: default-ubuntu-1604-2017-7-py2
|
||||
- INSTANCE: default-centos-6-2017-7-py2
|
||||
- INSTANCE: default-fedora-28-2017-7-py2
|
||||
- INSTANCE: default-opensuse-leap-42-2017-7-py2
|
||||
|
||||
script:
|
||||
- sudo modprobe ip_vs
|
||||
- bundle exec kitchen verify ${INSTANCE}
|
||||
|
||||
jobs:
|
||||
include:
|
||||
# Define the commitlint stage
|
||||
- stage: commitlint
|
||||
language: node_js
|
||||
node_js: lts/*
|
||||
before_install: skip
|
||||
script:
|
||||
- npm install @commitlint/config-conventional -D
|
||||
- npm install @commitlint/travis-cli -D
|
||||
- commitlint-travis
|
||||
# Define the release stage that runs semantic-release
|
||||
- stage: release
|
||||
language: node_js
|
||||
node_js: lts/*
|
||||
before_install: skip
|
||||
script:
|
||||
# Update `AUTHORS.md`
|
||||
- export MAINTAINER_TOKEN=${GH_TOKEN}
|
||||
- go get github.com/myii/maintainer
|
||||
- maintainer contributor
|
||||
|
||||
# Install all dependencies required for `semantic-release`
|
||||
- npm install @semantic-release/changelog@3 -D
|
||||
- npm install @semantic-release/exec@3 -D
|
||||
- npm install @semantic-release/git@7 -D
|
||||
deploy:
|
||||
provider: script
|
||||
skip_cleanup: true
|
||||
script:
|
||||
# Run `semantic-release`
|
||||
- npx semantic-release@15
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
name: keepalived
|
||||
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, MacOS
|
||||
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, MacOS
|
||||
version: 1.0
|
||||
release: 0
|
||||
minimum_version: 2016.11
|
||||
summary: Rkhunter formula
|
||||
description: Formula to use to install and configure keepalived
|
||||
top_level_dir: keepalived
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'kitchen-docker', '>= 2.9'
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
gem 'kitchen-inspec', '>= 1.1'
|
||||
1
LICENSE
1
LICENSE
|
|
@ -199,4 +199,3 @@
|
|||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
|
|
|||
38
README.rst
38
README.rst
|
|
@ -1,38 +0,0 @@
|
|||
=======
|
||||
keepalived
|
||||
=======
|
||||
|
||||
Install, configure and run ``keepalived``.
|
||||
|
||||
.. note::
|
||||
|
||||
See the full `Salt Formulas installation and usage instructions
|
||||
<http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.
|
||||
|
||||
Available states
|
||||
================
|
||||
|
||||
.. contents::
|
||||
:local:
|
||||
|
||||
or the jinja template and the pillar for a salt approach.
|
||||
|
||||
``keepalived``
|
||||
-----------
|
||||
|
||||
Install, configure and run ``keepalived`` service.
|
||||
|
||||
``keepalived.install``
|
||||
-------------------
|
||||
|
||||
Install ``keepalived`` from packages.
|
||||
|
||||
``keepalived.config``
|
||||
------------------
|
||||
|
||||
Configuration options for ``keepalived``.
|
||||
|
||||
``keepalived.service``
|
||||
-------------------
|
||||
|
||||
Make sure ``keepalived`` service is running.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
module.exports = {
|
||||
extends: ['@commitlint/config-conventional'],
|
||||
};
|
||||
|
|
@ -0,0 +1,158 @@
|
|||
.. _contributing:
|
||||
|
||||
How to contribute
|
||||
=================
|
||||
|
||||
This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one.
|
||||
What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo.
|
||||
It also covers how to contribute to this *formula's documentation*.
|
||||
|
||||
.. contents:: **Table of Contents**
|
||||
|
||||
Overview
|
||||
--------
|
||||
|
||||
Submitting a pull request is more than just code!
|
||||
To achieve a quality product, the *tests* and *documentation* need to be updated as well.
|
||||
An excellent pull request will include these in the changes, wherever relevant.
|
||||
|
||||
Commit message formatting
|
||||
-------------------------
|
||||
|
||||
Since every type of change requires making Git commits,
|
||||
we will start by covering the importance of ensuring that all of your commit
|
||||
messages are in the correct format.
|
||||
|
||||
Automation of multiple processes
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
This formula uses `semantic-release <https://github.com/semantic-release/semantic-release>`_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog.
|
||||
The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation.
|
||||
|
||||
Full details are available in the upstream docs regarding the `Angular Commit Message Conventions <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines>`_.
|
||||
The key factor is that the first line of the commit message must follow this format:
|
||||
|
||||
.. code-block::
|
||||
|
||||
type(scope): subject
|
||||
|
||||
|
||||
* E.g. ``docs(contributing): add commit message formatting instructions``.
|
||||
|
||||
Besides the version bump, the changelog and release notes are formatted accordingly.
|
||||
So based on the example above:
|
||||
|
||||
..
|
||||
|
||||
.. raw:: html
|
||||
|
||||
<h3>Documentation</h3>
|
||||
|
||||
* **contributing:** add commit message formatting instructions
|
||||
|
||||
|
||||
* The ``type`` translates into a ``Documentation`` sub-heading.
|
||||
* The ``(scope):`` will be shown in bold text without the brackets.
|
||||
* The ``subject`` follows the ``scope`` as standard text.
|
||||
|
||||
Linting commit messages in Travis CI
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
This formula uses `commitlint <https://github.com/conventional-changelog/commitlint>`_ for checking commit messages during CI testing.
|
||||
This ensures that they are in accordance with the ``semantic-release`` settings.
|
||||
|
||||
For more details about the default settings, refer back to the ``commitlint`` `reference rules <https://conventional-changelog.github.io/commitlint/#/reference-rules>`_.
|
||||
|
||||
Relationship between commit type and version bump
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
This formula applies some customisations to the defaults, as outlined in the table below,
|
||||
based upon the `type <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type>`_ of the commit:
|
||||
|
||||
.. list-table::
|
||||
:name: commit-type-vs-version-bump
|
||||
:header-rows: 1
|
||||
:stub-columns: 0
|
||||
:widths: 1,2,3,1,1
|
||||
|
||||
* - Type
|
||||
- Heading
|
||||
- Description
|
||||
- Bump (default)
|
||||
- Bump (custom)
|
||||
* - ``build``
|
||||
- Build System
|
||||
- Changes related to the build system
|
||||
- –
|
||||
-
|
||||
* - ``chore``
|
||||
- –
|
||||
- Changes to the build process or auxiliary tools and libraries such as
|
||||
documentation generation
|
||||
- –
|
||||
-
|
||||
* - ``ci``
|
||||
- Continuous Integration
|
||||
- Changes to the continuous integration configuration
|
||||
- –
|
||||
-
|
||||
* - ``docs``
|
||||
- Documentation
|
||||
- Documentation only changes
|
||||
- –
|
||||
- 0.0.1
|
||||
* - ``feat``
|
||||
- Features
|
||||
- A new feature
|
||||
- 0.1.0
|
||||
-
|
||||
* - ``fix``
|
||||
- Bug Fixes
|
||||
- A bug fix
|
||||
- 0.0.1
|
||||
-
|
||||
* - ``perf``
|
||||
- Performance Improvements
|
||||
- A code change that improves performance
|
||||
- 0.0.1
|
||||
-
|
||||
* - ``refactor``
|
||||
- Code Refactoring
|
||||
- A code change that neither fixes a bug nor adds a feature
|
||||
- –
|
||||
- 0.0.1
|
||||
* - ``revert``
|
||||
- Reverts
|
||||
- A commit used to revert a previous commit
|
||||
- –
|
||||
- 0.0.1
|
||||
* - ``style``
|
||||
- Styles
|
||||
- Changes that do not affect the meaning of the code (white-space,
|
||||
formatting, missing semi-colons, etc.)
|
||||
- –
|
||||
- 0.0.1
|
||||
* - ``test``
|
||||
- Tests
|
||||
- Adding missing or correcting existing tests
|
||||
- –
|
||||
- 0.0.1
|
||||
|
||||
Use ``BREAKING CHANGE`` to trigger a ``major`` version change
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used.
|
||||
This will be appended to the changelog and release notes as well.
|
||||
To preserve good formatting of these notes, the following format is prescribed:
|
||||
|
||||
* ``BREAKING CHANGE: <explanation in paragraph format>.``
|
||||
|
||||
An example of that:
|
||||
|
||||
.. code-block:: git
|
||||
|
||||
...
|
||||
|
||||
BREAKING CHANGE: With the removal of all of the `.sls` files under
|
||||
`template package`, this formula no longer supports the installation of
|
||||
packages.
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
.. _readme:
|
||||
|
||||
keepalived-formula
|
||||
==================
|
||||
|
||||
|img_travis| |img_sr|
|
||||
|
||||
.. |img_travis| image:: https://travis-ci.com/saltstack-formulas/keepalived-formula.svg?branch=master
|
||||
:alt: Travis CI Build Status
|
||||
:scale: 100%
|
||||
:target: https://travis-ci.com/saltstack-formulas/keepalived-formula
|
||||
.. |img_sr| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
|
||||
:alt: Semantic Release
|
||||
:scale: 100%
|
||||
:target: https://github.com/semantic-release/semantic-release
|
||||
|
||||
Formula to set up and configure keepalived
|
||||
|
||||
.. contents:: **Table of Contents**
|
||||
|
||||
General notes
|
||||
-------------
|
||||
|
||||
See the full `SaltStack Formulas installation and usage instructions
|
||||
<https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.
|
||||
|
||||
If you are interested in writing or contributing to formulas, please pay attention to the `Writing Formula Section
|
||||
<https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#writing-formulas>`_.
|
||||
|
||||
If you want to use this formula, please pay attention to the ``FORMULA`` file and/or ``git tag``,
|
||||
which contains the currently released version. This formula is versioned according to `Semantic Versioning <http://semver.org/>`_.
|
||||
|
||||
See `Formula Versioning Section <https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#versioning>`_ for more details.
|
||||
|
||||
Contributing to this repo
|
||||
-------------------------
|
||||
|
||||
**Commit message formatting is significant!!**
|
||||
|
||||
Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
|
||||
|
||||
Available states
|
||||
================
|
||||
|
||||
.. contents::
|
||||
:local:
|
||||
|
||||
``keepalived``
|
||||
--------------
|
||||
Installs and configures the keepalived package.
|
||||
|
||||
``keepalived.package``
|
||||
----------------------
|
||||
Installs the keepalived package.
|
||||
|
||||
``keepalived.config``
|
||||
---------------------
|
||||
This state manages the file ``keepalived.conf`` under ``/etc/keepalived`` (template found in "keepalived/files"). The configuration is populated by values in "keepalived/map.jinja" based on the package's default values (and RedHat, Debian, Suse and Arch family distribution specific values), which can then be overridden by values of the same name in pillar.
|
||||
|
||||
``keepalived.service``
|
||||
----------------------
|
||||
This state ensures that keepalived service is running.
|
||||
|
|
@ -0,0 +1,443 @@
|
|||
.. _tofs_pattern:
|
||||
|
||||
TOFS: A pattern for using SaltStack
|
||||
===================================
|
||||
|
||||
.. list-table::
|
||||
:name: tofs-authors
|
||||
:header-rows: 1
|
||||
:stub-columns: 1
|
||||
:widths: 2,2,3,2
|
||||
|
||||
* -
|
||||
- Person
|
||||
- Contact
|
||||
- Date
|
||||
* - Authored by
|
||||
- Roberto Moreda
|
||||
- moreda@allenta.com
|
||||
- 29/12/2014
|
||||
* - Modified by
|
||||
- Daniel Dehennin
|
||||
- daniel.dehennin@baby-gnu.org
|
||||
- 07/02/2019
|
||||
* - Modified by
|
||||
- Imran Iqbal
|
||||
- https://github.com/myii
|
||||
- 23/02/2019
|
||||
|
||||
All that follows is a proposal based on my experience with `SaltStack <http://www.saltstack.com/>`_. The good thing of a piece of software like this is that you can "bend it" to suit your needs in many possible ways, and this is one of them. All the recommendations and thoughts are given "as it is" with no warranty of any type.
|
||||
|
||||
.. contents:: **Table of Contents**
|
||||
|
||||
Usage of values in pillar vs templates in ``file_roots``
|
||||
--------------------------------------------------------
|
||||
|
||||
Among other functions, the *master* (or *salt-master*) serves files to the *minions* (or *salt-minions*). The `file_roots <http://docs.saltstack.com/en/latest/ref/file_server/file_roots.html>`_ is the list of directories used in sequence to find a file when a minion requires it: the first match is served to the minion. Those files could be `state files <http://docs.saltstack.com/en/latest/topics/tutorials/starting_states.html>`_ or configuration templates, among others.
|
||||
|
||||
Using SaltStack is a simple and effective way to implement configuration management, but even in a `non-multitenant <http://en.wikipedia.org/wiki/Multitenancy>`_ scenario, it is not a good idea to generally access some data (e.g. the database password in our `Zabbix <http://www.zabbix.com/>`_ server configuration file or the private key of our `Nginx <http://nginx.org/en/>`_ TLS certificate).
|
||||
|
||||
To avoid this situation we can use the `pillar mechanism <http://docs.saltstack.com/en/latest/topics/pillar/>`_, which is designed to provide controlled access to data from the minions based on some selection rules. As pillar data could be easily integrated in the `Jinja <http://docs.saltstack.com/en/latest/topics/tutorials/pillar.html>`_ templates, it is a good mechanism to store values to be used in the final rendering of state files and templates.
|
||||
|
||||
There are a variety of approaches on the usage of pillar and templates as seen in the `saltstack-formulas <https://github.com/saltstack-formulas>`_' repositories. `Some <https://github.com/saltstack-formulas/nginx-formula/pull/18>`_ `developments <https://github.com/saltstack-formulas/php-formula/pull/14>`_ stress the initial purpose of pillar data into a storage for most of the possible variables for a determined system configuration. This, in my opinion, is shifting too much load from the original template files approach. Adding up some `non-trivial Jinja <https://github.com/spsoit/nginx-formula/blob/81de880fe0276dd9488ffa15bc78944c0fc2b919/nginx/ng/files/nginx.conf>`_ code as essential part of composing the state file definitely makes SaltStack state files (hence formulas) more difficult to read. The extreme of this approach is that we could end up with a new render mechanism, implemented in Jinja, storing everything needed in pillar data to compose configurations. Additionally, we are establishing a strong dependency with the Jinja renderer.
|
||||
|
||||
In opposition to the *put the code in file_roots and the data in pillars* approach, there is the *pillar as a store for a set of key-values* approach. A full-blown configuration file abstracted in pillar and jinja is complicated to develop, understand and maintain. I think a better and simpler approach is to keep a configuration file templated using just a basic (non-extensive but extensible) set of pillar values.
|
||||
|
||||
On the reusability of SaltStack state files
|
||||
-------------------------------------------
|
||||
|
||||
There is a brilliant initiative of the SaltStack community called `salt-formulas <https://github.com/saltstack-formulas>`_. Their goal is to provide state files, pillar examples and configuration templates ready to be used for provisioning. I am a contributor for two small ones: `zabbix-formula <https://github.com/saltstack-formulas/zabbix-formula>`_ and `varnish-formula <https://github.com/saltstack-formulas/varnish-formula>`_.
|
||||
|
||||
The `design guidelines <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_ for formulas are clear in many aspects and it is a recommended reading for anyone willing to write state files, even non-formulaic ones.
|
||||
|
||||
In the next section, I am going to describe my proposal to extend further the reusability of formulas, suggesting some patterns of usage.
|
||||
|
||||
The Template Override and Files Switch (TOFS) pattern
|
||||
-----------------------------------------------------
|
||||
|
||||
I understand a formula as a **complete, independent set of SaltStack state and configuration template files sufficient to configure a system**. A system could be something as simple as an NTP server or some other much more complex service that requires many state and configuration template files.
|
||||
|
||||
The customization of a formula should be done mainly by providing pillar data used later to render either the state or the configuration template files.
|
||||
|
||||
Example: NTP before applying TOFS
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Let's work with the NTP example. A basic formula that follows the `design guidelines <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_ has the following files and directories tree:
|
||||
|
||||
.. code-block::
|
||||
|
||||
/srv/saltstack/salt-formulas/ntp-saltstack-formula/
|
||||
ntp/
|
||||
map.jinja
|
||||
init.sls
|
||||
conf.sls
|
||||
files/
|
||||
default/
|
||||
etc/
|
||||
ntp.conf.jinja
|
||||
|
||||
In order to use it, let's assume a `masterless configuration <http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html>`_ and this relevant section of ``/etc/salt/minion``:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
pillar_roots:
|
||||
base:
|
||||
- /srv/saltstack/pillar
|
||||
file_client: local
|
||||
file_roots:
|
||||
base:
|
||||
- /srv/saltstack/salt
|
||||
- /srv/saltstack/salt-formulas/ntp-saltstack-formula
|
||||
|
||||
.. code-block:: jinja
|
||||
|
||||
{#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/map.jinja #}
|
||||
{%- set ntp = salt['grains.filter_by']({
|
||||
'default': {
|
||||
'pkg': 'ntp',
|
||||
'service': 'ntp',
|
||||
'config': '/etc/ntp.conf',
|
||||
},
|
||||
}, merge=salt['pillar.get']('ntp:lookup')) %}
|
||||
|
||||
In ``init.sls`` we have the minimal states required to have NTP configured. In many cases ``init.sls`` is almost equivalent to an ``apt-get install`` or a ``yum install`` of the package.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/init.sls
|
||||
{%- from 'ntp/map.jinja' import ntp with context %}
|
||||
|
||||
Install NTP:
|
||||
pkg.installed:
|
||||
- name: {{ ntp.pkg }}
|
||||
|
||||
Enable and start NTP:
|
||||
service.running:
|
||||
- name: {{ ntp.service }}
|
||||
- enabled: True
|
||||
- require:
|
||||
- pkg: Install NTP package
|
||||
|
||||
In ``conf.sls`` we have the configuration states. In most cases, that is just managing configuration file templates and making them to be watched by the service.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
|
||||
include:
|
||||
- ntp
|
||||
|
||||
{%- from 'ntp/map.jinja' import ntp with context %}
|
||||
|
||||
Configure NTP:
|
||||
file.managed:
|
||||
- name: {{ ntp.config }}
|
||||
- template: jinja
|
||||
- source: salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
- watch_in:
|
||||
- service: Enable and start NTP service
|
||||
- require:
|
||||
- pkg: Install NTP package
|
||||
|
||||
Under ``files/default``, there is a structure that mimics the one in the minion in order to avoid clashes and confusion on where to put the needed templates. There you can find a mostly standard template for the configuration file.
|
||||
|
||||
.. code-block:: jinja
|
||||
|
||||
{#- /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/default/etc/ntp.conf.jinja #}
|
||||
{#- Managed by saltstack #}
|
||||
{#- Edit pillars or override this template in saltstack if you need customization #}
|
||||
{%- set settings = salt['pillar.get']('ntp', {}) %}
|
||||
{%- set default_servers = ['0.ubuntu.pool.ntp.org',
|
||||
'1.ubuntu.pool.ntp.org',
|
||||
'2.ubuntu.pool.ntp.org',
|
||||
'3.ubuntu.pool.ntp.org'] %}
|
||||
|
||||
driftfile /var/lib/ntp/ntp.drift
|
||||
statistics loopstats peerstats clockstats
|
||||
filegen loopstats file loopstats type day enable
|
||||
filegen peerstats file peerstats type day enable
|
||||
filegen clockstats file clockstats type day enable
|
||||
|
||||
{%- for server in settings.get('servers', default_servers) %}
|
||||
server {{ server }}
|
||||
{%- endfor %}
|
||||
|
||||
restrict -4 default kod notrap nomodify nopeer noquery
|
||||
restrict -6 default kod notrap nomodify nopeer noquery
|
||||
|
||||
restrict 127.0.0.1
|
||||
restrict ::1
|
||||
|
||||
With all this, it is easy to install and configure a simple NTP server by just running ``salt-call state.sls ntp.conf``: the package will be installed, the service will be running and the configuration should be correct for most of cases, even without pillar data.
|
||||
|
||||
Alternatively, you can define a highstate in ``/srv/saltstack/salt/top.sls`` and run ``salt-call state.highstate``.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt/top.sls
|
||||
base:
|
||||
'*':
|
||||
- ntp.conf
|
||||
|
||||
**Customizing the formula just with pillar data**, we have the option to define the NTP servers.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/pillar/top.sls
|
||||
base:
|
||||
'*':
|
||||
- ntp
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/pillar/ntp.sls
|
||||
ntp:
|
||||
servers:
|
||||
- 0.ch.pool.ntp.org
|
||||
- 1.ch.pool.ntp.org
|
||||
- 2.ch.pool.ntp.org
|
||||
- 3.ch.pool.ntp.org
|
||||
|
||||
Template Override
|
||||
^^^^^^^^^^^^^^^^^
|
||||
|
||||
If the customization based on pillar data is not enough, we can override the template by creating a new one in ``/srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja``
|
||||
|
||||
.. code-block:: jinja
|
||||
|
||||
{#- /srv/saltstack/salt/ntp/files/default/etc/ntp.conf.jinja #}
|
||||
{#- Managed by saltstack #}
|
||||
{#- Edit pillars or override this template in saltstack if you need customization #}
|
||||
|
||||
{#- Some bizarre configurations here #}
|
||||
{#- ... #}
|
||||
|
||||
{%- for server in settings.get('servers', default_servers) %}
|
||||
server {{ server }}
|
||||
{%- endfor %}
|
||||
|
||||
This way we are locally **overriding the template files** offered by the formula in order to make a more complex adaptation. Of course, this could be applied as well to any of the files, including the state files.
|
||||
|
||||
Files Switch
|
||||
^^^^^^^^^^^^
|
||||
|
||||
To bring some order into the set of template files included in a formula, as we commented, we suggest having a similar structure to a normal final file system under ``files/default``.
|
||||
|
||||
We can make different templates coexist for different minions, classified by any `grain <http://docs.saltstack.com/en/latest/topics/targeting/grains.html>`_ value, by simply creating new directories under ``files``. This mechanism is based on **using values of some grains as a switch for the directories under** ``files/``.
|
||||
|
||||
If we decide that we want ``os_family`` as switch, then we could provide the formula template variants for both the ``RedHat`` and ``Debian`` families.
|
||||
|
||||
.. code-block::
|
||||
|
||||
/srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/files/
|
||||
default/
|
||||
etc/
|
||||
ntp.conf.jinja
|
||||
RedHat/
|
||||
etc/
|
||||
ntp.conf.jinja
|
||||
Debian/
|
||||
etc/
|
||||
ntp.conf.jinja
|
||||
|
||||
To make this work we need a ``conf.sls`` state file that takes a list of possible files as the configuration template.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
|
||||
include:
|
||||
- ntp
|
||||
|
||||
{%- from 'ntp/map.jinja' import ntp with context %}
|
||||
|
||||
Configure NTP:
|
||||
file.managed:
|
||||
- name: {{ ntp.config }}
|
||||
- template: jinja
|
||||
- source:
|
||||
- salt://ntp/files/{{ grains.get('os_family', 'default') }}/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
- watch_in:
|
||||
- service: Enable and start NTP service
|
||||
- require:
|
||||
- pkg: Install NTP package
|
||||
|
||||
If we want to cover the possibility of a special template for a minion identified by ``node01`` then we could have a specific template in ``/srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja``.
|
||||
|
||||
.. code-block:: jinja
|
||||
|
||||
{#- /srv/saltstack/salt/ntp/files/node01/etc/ntp.conf.jinja #}
|
||||
{#- Managed by saltstack #}
|
||||
{#- Edit pillars or override this template in saltstack if you need customization #}
|
||||
|
||||
{#- Some crazy configurations here for node01 #}
|
||||
{#- ... #}
|
||||
|
||||
To make this work we could write a specially crafted ``conf.sls``.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
|
||||
include:
|
||||
- ntp
|
||||
|
||||
{%- from 'ntp/map.jinja' import ntp with context %}
|
||||
|
||||
Configure NTP:
|
||||
file.managed:
|
||||
- name: {{ ntp.config }}
|
||||
- template: jinja
|
||||
- source:
|
||||
- salt://ntp/files/{{ grains.get('id') }}/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/{{ grains.get('os_family') }}/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
- watch_in:
|
||||
- service: Enable and start NTP service
|
||||
- require:
|
||||
- pkg: Install NTP package
|
||||
|
||||
Using the ``files_switch`` macro
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in the ``source`` parameter for the ``file.managed`` state.
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
## /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/conf.sls
|
||||
include:
|
||||
- ntp
|
||||
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- from 'ntp/map.jinja' import ntp with context %}
|
||||
{%- from 'ntp/libtofs.jinja' import files_switch %}
|
||||
|
||||
Configure NTP:
|
||||
file.managed:
|
||||
- name: {{ ntp.config }}
|
||||
- template: jinja
|
||||
- source: {{ files_switch(['/etc/ntp.conf.jinja'],
|
||||
lookup='Configure NTP'
|
||||
)
|
||||
}}
|
||||
- watch_in:
|
||||
- service: Enable and start NTP service
|
||||
- require:
|
||||
- pkg: Install NTP package
|
||||
|
||||
|
||||
* This uses ``config.get``, searching for ``ntp:tofs:source_files:Configure NTP`` to determine the list of template files to use.
|
||||
* If this does not yield any results, the default of ``['/etc/ntp.conf.jinja']`` will be used.
|
||||
|
||||
In ``libtofs.jinja``, we define this new macro ``files_switch``.
|
||||
|
||||
.. literalinclude:: ../template/libtofs.jinja
|
||||
:caption: /srv/saltstack/salt-formulas/ntp-saltstack-formula/ntp/libtofs.jinja
|
||||
:language: jinja
|
||||
|
||||
How to customise the ``source`` further
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
The examples below are based on an ``Ubuntu`` minion called ``theminion`` being configured via. pillar.
|
||||
|
||||
Using the default settings of the ``files_switch`` macro above,
|
||||
the ``source`` will be:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
- source:
|
||||
- salt://ntp/files/theminion/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/Debian/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
|
||||
Customise ``files``
|
||||
~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The ``files`` portion can be customised:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
ntp:
|
||||
tofs:
|
||||
dirs:
|
||||
files: files_alt
|
||||
|
||||
Resulting in:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
- source:
|
||||
- salt://ntp/files_alt/theminion/etc/ntp.conf.jinja
|
||||
- salt://ntp/files_alt/Debian/etc/ntp.conf.jinja
|
||||
- salt://ntp/files_alt/default/etc/ntp.conf.jinja
|
||||
|
||||
Customise the use of grains
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Grains can be customised and even arbitrary paths can be supplied:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
ntp:
|
||||
tofs:
|
||||
files_switch:
|
||||
- any/path/can/be/used/here
|
||||
- id
|
||||
- os
|
||||
- os_family
|
||||
|
||||
Resulting in:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
- source:
|
||||
- salt://ntp/files/any/path/can/be/used/here/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/theminion/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/Ubuntu/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/Debian/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
|
||||
Customise the ``default`` path
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The ``default`` portion of the path can be customised:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
ntp:
|
||||
tofs:
|
||||
dirs:
|
||||
default: default_alt
|
||||
|
||||
Resulting in:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
- source:
|
||||
...
|
||||
- salt://ntp/files/default_alt/etc/ntp.conf.jinja
|
||||
|
||||
Customise the list of ``source_files``
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The list of ``source_files`` can be given:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
ntp:
|
||||
tofs:
|
||||
source_files:
|
||||
Configure NTP:
|
||||
- '/etc/ntp.conf.jinja'
|
||||
- '/etc/ntp.conf_alt.jinja'
|
||||
|
||||
Resulting in:
|
||||
|
||||
.. code-block:: sls
|
||||
|
||||
- source:
|
||||
- salt://ntp/files/theminion/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/theminion/etc/ntp.conf_alt.jinja
|
||||
- salt://ntp/files/Debian/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/Debian/etc/ntp.conf_alt.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf.jinja
|
||||
- salt://ntp/files/default/etc/ntp.conf_alt.jinja
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
keepalived.config:
|
||||
file.managed:
|
||||
- name: {{ salt['pillar.get']('keepalived:config_file_path', '/etc/keepalived/keepalived.conf') }}
|
||||
- source: salt://keepalived/templates/keepalived.jinja
|
||||
- template: jinja
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 644
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- set sls_package_install = tplroot ~ '.package.install' %}
|
||||
{%- from tplroot ~ "/map.jinja" import keepalived with context %}
|
||||
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
|
||||
|
||||
include:
|
||||
- {{ sls_package_install }}
|
||||
|
||||
keepalived-config-file-file-managed:
|
||||
file.managed:
|
||||
- name: {{ keepalived.config_file }}
|
||||
- user: root
|
||||
- group: root
|
||||
- template: jinja
|
||||
- source: {{ files_switch(['keepalived.conf.tmpl', 'keepalived.conf.tmpl.jinja'],
|
||||
lookup='keepalived-config-file-file-managed'
|
||||
)
|
||||
}}
|
||||
- require:
|
||||
- sls: {{ sls_package_install }}
|
||||
- context:
|
||||
config: {{ keepalived.config | json }}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
include:
|
||||
- .file
|
||||
|
|
@ -1,5 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# keepalived/defaults.yaml
|
||||
|
||||
global_defs:
|
||||
smtp_server: localhost
|
||||
keepalived:
|
||||
package: keepalived
|
||||
config_file: /etc/keepalived/keepalived.conf
|
||||
service:
|
||||
name: keepalived
|
||||
config:
|
||||
global_defs:
|
||||
smtp_server: localhost
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
########################################################################
|
||||
# File managed by Salt at <{{ source }}>.
|
||||
# Your changes will be overwritten.
|
||||
########################################################################
|
||||
|
||||
{%- from "keepalived/macro.jinja" import print_config %}
|
||||
{%- set sections = ['global_defs', 'vrrp_script', 'vrrp_instance', 'virtual_server'] %}
|
||||
{%- for section in sections %}
|
||||
{{ print_config({ section: config[section] }) }}
|
||||
{%- endfor %}
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
# keepalived
|
||||
#
|
||||
# Meta-state to fully setup keepalived on debian. (or any other distro that has keepalived in their repo)
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
include:
|
||||
- keepalived.install
|
||||
- keepalived.service
|
||||
- keepalived.config
|
||||
- .package
|
||||
- .config
|
||||
- .service
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
keepalived.install:
|
||||
pkg.installed:
|
||||
- name: keepalived
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
{%- macro files_switch(source_files,
|
||||
lookup=None,
|
||||
default_files_switch=['id', 'os_family'],
|
||||
indent_width=6,
|
||||
v1_path_prefix='') %}
|
||||
{#-
|
||||
Returns a valid value for the "source" parameter of a "file.managed"
|
||||
state function. This makes easier the usage of the Template Override and
|
||||
Files Switch (TOFS) pattern.
|
||||
|
||||
Params:
|
||||
* source_files: ordered list of files to look for
|
||||
* lookup: key under '<tplroot>:tofs:source_files' to override
|
||||
list of source files
|
||||
* default_files_switch: if there's no config (e.g. pillar)
|
||||
'<tplroot>:tofs:files_switch' this is the ordered list of grains to
|
||||
use as selector switch of the directories under
|
||||
"<path_prefix>/files"
|
||||
* indent_witdh: indentation of the result value to conform to YAML
|
||||
* v1_path_prefix: (deprecated) only used for injecting a path prefix into
|
||||
the source, to support older TOFS configs
|
||||
|
||||
Example (based on a `tplroot` of `xxx`):
|
||||
|
||||
If we have a state:
|
||||
|
||||
Deploy configuration:
|
||||
file.managed:
|
||||
- name: /etc/yyy/zzz.conf
|
||||
- source: {{ files_switch(['/etc/yyy/zzz.conf', '/etc/yyy/zzz.conf.jinja'],
|
||||
lookup='Deploy configuration'
|
||||
) }}
|
||||
- template: jinja
|
||||
|
||||
In a minion with id=theminion and os_family=RedHat, it's going to be
|
||||
rendered as:
|
||||
|
||||
Deploy configuration:
|
||||
file.managed:
|
||||
- name: /etc/yyy/zzz.conf
|
||||
- source:
|
||||
- salt://xxx/files/theminion/etc/yyy/zzz.conf
|
||||
- salt://xxx/files/theminion/etc/yyy/zzz.conf.jinja
|
||||
- salt://xxx/files/RedHat/etc/yyy/zzz.conf
|
||||
- salt://xxx/files/RedHat/etc/yyy/zzz.conf.jinja
|
||||
- salt://xxx/files/default/etc/yyy/zzz.conf
|
||||
- salt://xxx/files/default/etc/yyy/zzz.conf.jinja
|
||||
- template: jinja
|
||||
#}
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
|
||||
{%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
|
||||
{%- set files_switch_list = salt['config.get'](
|
||||
tplroot ~ ':tofs:files_switch',
|
||||
default_files_switch
|
||||
) %}
|
||||
{#- Lookup source_files (v2), files (v1), or fallback to source_files parameter #}
|
||||
{%- set src_files = salt['config.get'](
|
||||
tplroot ~ ':tofs:source_files:' ~ lookup,
|
||||
salt['config.get'](
|
||||
tplroot ~ ':tofs:files:' ~ lookup,
|
||||
source_files
|
||||
)
|
||||
) %}
|
||||
{#- Only add to [''] when supporting older TOFS implementations #}
|
||||
{%- set path_prefix_exts = [''] %}
|
||||
{%- if v1_path_prefix != '' %}
|
||||
{%- do path_prefix_exts.append(v1_path_prefix) %}
|
||||
{%- endif %}
|
||||
{%- for path_prefix_ext in path_prefix_exts %}
|
||||
{%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
|
||||
{#- For older TOFS implementation, use `files_switch` from the config #}
|
||||
{#- Use the default, new method otherwise #}
|
||||
{%- set fsl = salt['config.get'](
|
||||
tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch',
|
||||
files_switch_list
|
||||
) %}
|
||||
{#- Append an empty value to evaluate as `default` in the loop below #}
|
||||
{%- if '' not in fsl %}
|
||||
{%- do fsl.append('') %}
|
||||
{%- endif %}
|
||||
{%- for fs in fsl %}
|
||||
{%- for src_file in src_files %}
|
||||
{%- if fs %}
|
||||
{%- set fs_dir = salt['config.get'](fs, fs) %}
|
||||
{%- else %}
|
||||
{%- set fs_dir = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
|
||||
{%- endif %}
|
||||
{%- set url = '- salt://' ~ '/'.join([
|
||||
path_prefix_inc_ext,
|
||||
files_dir,
|
||||
fs_dir,
|
||||
src_file.lstrip('/')
|
||||
]) %}
|
||||
{{ url | indent(indent_width, true) }}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
{%- endmacro %}
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=jinja
|
||||
|
||||
{%- set key = 0 -%}
|
||||
{%- set value = 1 -%}
|
||||
{%- set carryovers = ['real_server', 'virtual_server', 'virtual_server_group',
|
||||
'vrrp_instance', 'vrrp_script', 'vrrp_sync_group'] -%}
|
||||
{%- macro keepalived_config(data, carryover='', recurse=-1, indent=0) -%}
|
||||
{%- set carryovers = ['real_server', 'virtual_server', 'virtual_server_group', 'vrrp_instance', 'vrrp_script', 'vrrp_sync_group'] -%}
|
||||
|
||||
{%- macro print_config(data, carryover='', recurse=-1, indent=0) -%}
|
||||
{%- set recurse = recurse + 1 -%}
|
||||
{%- if data is none -%}
|
||||
{{- '\n' -}}
|
||||
|
|
@ -16,7 +19,7 @@
|
|||
{%- if data is mapping -%}
|
||||
{%- for item in data|dictsort -%}
|
||||
{%- if item[key] in carryovers -%}
|
||||
{{- keepalived_config(item[value], carryover=item[key], indent=indent) -}}
|
||||
{{- print_config(item[value], carryover=item[key], indent=indent) -}}
|
||||
{%- else -%}
|
||||
{%- set carryIndent = indent -%}
|
||||
{%- set forwardIndent = indent -%}
|
||||
|
|
@ -27,12 +30,12 @@
|
|||
{%- if item[value] is string or item[value] is not iterable -%}
|
||||
{%- set forwardIndent = 0 -%}
|
||||
{%- endif -%}
|
||||
{{- item[key]|indent(carryIndent, True) }} {{ keepalived_config(item[value], recurse=recurse, indent=forwardIndent) -}}
|
||||
{{- item[key]|indent(carryIndent, True) }} {{ print_config(item[value], recurse=recurse, indent=forwardIndent) -}}
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
{%- else -%}
|
||||
{%- for item in data -%}
|
||||
{{- keepalived_config(item, indent=indent) -}}
|
||||
{{- print_config(item, indent=indent) -}}
|
||||
{%- endfor -%}
|
||||
{%- endif -%}
|
||||
{%- if recurse > 0 -%}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=jinja
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{#- Start imports as #}
|
||||
{%- import_yaml tplroot ~ "/defaults.yaml" or {} as default_settings %}
|
||||
{%- import_yaml tplroot ~ "/osfamilymap.yaml" or {} as osfamilymap %}
|
||||
{%- import_yaml tplroot ~ "/osmap.yaml" or {} as osmap %}
|
||||
{%- import_yaml tplroot ~ "/osfingermap.yaml" or {} as osfingermap %}
|
||||
|
||||
{%- set defaults = salt['grains.filter_by'](default_settings,
|
||||
default='keepalived',
|
||||
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
|
||||
merge=salt['grains.filter_by'](osmap, grain='os',
|
||||
merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
|
||||
merge=salt['pillar.get']('keepalived:lookup', default={})
|
||||
)
|
||||
)
|
||||
)
|
||||
) %}
|
||||
|
||||
{#- Merge the keepalived pillar #}
|
||||
{%- set keepalived = salt['pillar.get']('keepalived', default=defaults, merge=True) %}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
Debian: {}
|
||||
RedHat: {}
|
||||
Suse: {}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
Debian-8: {}
|
||||
Debian-9: {}
|
||||
Ubuntu-16.04: {}
|
||||
Ubuntu-18.04: {}
|
||||
Fedora-28: {}
|
||||
Fedora-29: {}
|
||||
CentOS-7: {}
|
||||
openSUSE-4.23: {}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
Debian: {}
|
||||
Ubuntu: {}
|
||||
Fedora: {}
|
||||
CentOS: {}
|
||||
openSUSE: {}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
include:
|
||||
- .install
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- from tplroot ~ "/map.jinja" import keepalived with context %}
|
||||
|
||||
keepalived-package-install-pkg-installed:
|
||||
pkg.installed:
|
||||
- name: {{ keepalived.package }}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
keepalived.service:
|
||||
service.running:
|
||||
- name: keepalived
|
||||
- enable: True
|
||||
- reload: True
|
||||
- require:
|
||||
- pkg: keepalived
|
||||
- watch:
|
||||
- file: keepalived.config
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
include:
|
||||
- .running
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- set sls_config_file = tplroot ~ '.config.file' %}
|
||||
{%- from tplroot ~ "/map.jinja" import keepalived with context %}
|
||||
|
||||
include:
|
||||
- {{ sls_config_file }}
|
||||
|
||||
keepalived-service-running-service-running:
|
||||
service.running:
|
||||
- name: {{ keepalived.service.name }}
|
||||
- enable: True
|
||||
- require:
|
||||
- sls: {{ sls_config_file }}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
# keepalived configuration
|
||||
#
|
||||
# **** DO NOT EDIT THIS FILE ****
|
||||
#
|
||||
# This file is managed by Salt.
|
||||
# Any changes will be overwritten.
|
||||
{{ '\n' }}
|
||||
|
||||
{%- import 'keepalived/templates/config.jinja' as config -%}
|
||||
{%- import_yaml 'keepalived/defaults.yaml' as keepalived_defaults -%}
|
||||
{%- set keepalived_final_values = salt.pillar.get(
|
||||
'keepalived',
|
||||
default=keepalived_defaults,
|
||||
merge=True) -%}
|
||||
{{ config.keepalived_config(keepalived_final_values) }}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
{% import 'config.jinja' as config %}
|
||||
{{ config.keepalived_config(testdata) }}
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# For help on this file's format, see https://kitchen.ci/
|
||||
driver:
|
||||
name: docker
|
||||
use_sudo: false
|
||||
privileged: true
|
||||
run_command: /lib/systemd/systemd
|
||||
|
||||
# Make sure the platforms listed below match up with
|
||||
# the `env.matrix` instances defined in `.travis.yml`
|
||||
platforms:
|
||||
## SALT 2019.2
|
||||
- name: debian-9-2019-2-py3
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:debian-9
|
||||
- name: ubuntu-1804-2019-2-py3
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
|
||||
- name: centos-7-2019-2-py3
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:centos-7
|
||||
- name: fedora-29-2019-2-py3
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:fedora-29
|
||||
- name: opensuse-leap-15-2019-2-py3
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT 2018.3
|
||||
- name: debian-9-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:debian-9
|
||||
- name: ubuntu-1604-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
|
||||
- name: centos-7-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:centos-7
|
||||
- name: fedora-29-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:fedora-29
|
||||
# TODO: Use this when fixed instead of `opensuse-leap-42`
|
||||
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
|
||||
# - name: opensuse-leap-15-2018-3-py2
|
||||
# driver:
|
||||
# image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
||||
# run_command: /usr/lib/systemd/systemd
|
||||
- name: opensuse-leap-42-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT 2017.7
|
||||
- name: debian-8-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:debian-8
|
||||
- name: ubuntu-1604-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
|
||||
- name: centos-6-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:centos-6
|
||||
run_command: /sbin/init
|
||||
- name: fedora-28-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:fedora-28
|
||||
- name: opensuse-leap-42-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
provisioner:
|
||||
name: salt_solo
|
||||
log_level: info
|
||||
salt_install: none
|
||||
require_chef: false
|
||||
formula: keepalived
|
||||
salt_copy_filter:
|
||||
- .kitchen
|
||||
- .git
|
||||
state_top:
|
||||
base:
|
||||
'*':
|
||||
- keepalived
|
||||
pillars:
|
||||
top.sls:
|
||||
base:
|
||||
'*':
|
||||
- keepalived
|
||||
pillars_from_files:
|
||||
keepalived.sls: pillar.example
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
name: inspec
|
||||
sudo: true
|
||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||
reporter:
|
||||
- cli
|
||||
inspec_tests:
|
||||
- path: test/integration/default
|
||||
|
||||
suites:
|
||||
- name: default
|
||||
254
pillar.example
254
pillar.example
|
|
@ -4,133 +4,139 @@
|
|||
# Boolean entries must be placed stored as strings, otherwise it will show
|
||||
# up as 1 or 0 in the config file.
|
||||
#
|
||||
# Anything that needs to be in quotes in the configuration file needs to
|
||||
# be escaped in the yaml file. Otherwise the quotes will not appear in
|
||||
# Anything that needs to be in quotes in the configuration file needs to
|
||||
# be escaped in the yaml file. Otherwise the quotes will not appear in
|
||||
# the config file.
|
||||
#
|
||||
# When order is important, put the entries into a yaml array or list. This
|
||||
# could be used to place vrrp_script before vrrp_instance entries.
|
||||
# When order is important, put the entries into a yaml array or list. This
|
||||
# could be used to place vrrp_script before vrrp_instance entries.
|
||||
|
||||
# The following would generate the example file in RedHat based systems.
|
||||
|
||||
keepalived:
|
||||
global_defs:
|
||||
notification_email:
|
||||
- acassen@firewall.loc
|
||||
- failover@firewall.loc
|
||||
- sysadmin@firewall.loc
|
||||
notification_email_from: Alexandre.Cassen@firewall.loc
|
||||
smtp_server: 192.168.200.1
|
||||
smtp_connect_timeout: 30
|
||||
router_id: LVS_DEVEL
|
||||
vrrp_instance:
|
||||
VI_1:
|
||||
state: MASTER
|
||||
interface: eth0
|
||||
virtual_router_id: 51
|
||||
priority: 100
|
||||
advert_int: 1
|
||||
authentication:
|
||||
auth_type: PASS
|
||||
auth_pass: 1111
|
||||
virtual_ipaddress:
|
||||
- 192.168.200.16
|
||||
- 192.168.200.17
|
||||
- 192.168.200.18
|
||||
virtual_server:
|
||||
# Virtual and real servers include the port as part of the ID.
|
||||
192.168.200.100 443:
|
||||
delay_loop: 6
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
nat_mask: 255.255.255.0
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
real_server:
|
||||
192.168.201.100 443:
|
||||
weight: 1
|
||||
SSL_GET:
|
||||
# Must be a list because of multiple URL entries.
|
||||
- url:
|
||||
path: /
|
||||
digest: ff20ad2481f97b1754ef3e12ecd3a9cc
|
||||
- url:
|
||||
path: /mrtg/
|
||||
digest: 9b3a0c85a887a256d6939da88aabd8cd
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
10.10.10.2 1358:
|
||||
delay_loop: 6
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
sorry_server: 192.168.200.200 1358
|
||||
real_server:
|
||||
192.168.200.2 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
# Must be a list because of multiple URL entries.
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
192.168.200.3 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334c
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334c
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
10.10.10.3 1358:
|
||||
delay_loop: 3
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
nat_mask: 255.255.255.0
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
real_server:
|
||||
192.168.200.4 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
192.168.200.5 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
config:
|
||||
global_defs:
|
||||
notification_email:
|
||||
- acassen@firewall.loc
|
||||
- failover@firewall.loc
|
||||
- sysadmin@firewall.loc
|
||||
notification_email_from: Alexandre.Cassen@firewall.loc
|
||||
smtp_server: 192.168.200.1
|
||||
smtp_connect_timeout: 30
|
||||
router_id: LVS_DEVEL
|
||||
vrrp_instance:
|
||||
VI_1:
|
||||
state: MASTER
|
||||
interface: eth0
|
||||
virtual_router_id: 51
|
||||
priority: 100
|
||||
advert_int: 1
|
||||
authentication:
|
||||
auth_type: PASS
|
||||
auth_pass: 1111
|
||||
virtual_ipaddress:
|
||||
- 192.168.200.16
|
||||
- 192.168.200.17
|
||||
- 192.168.200.18
|
||||
virtual_server:
|
||||
# Virtual and real servers include the port as part of the ID.
|
||||
192.168.200.100 443:
|
||||
delay_loop: 6
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
nat_mask: 255.255.255.0
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
real_server:
|
||||
192.168.201.100 443:
|
||||
weight: 1
|
||||
SSL_GET:
|
||||
# Must be a list because of multiple URL entries.
|
||||
- url:
|
||||
path: /
|
||||
digest: ff20ad2481f97b1754ef3e12ecd3a9cc
|
||||
- url:
|
||||
path: /mrtg/
|
||||
digest: 9b3a0c85a887a256d6939da88aabd8cd
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
10.10.10.2 1358:
|
||||
delay_loop: 6
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
sorry_server: 192.168.200.200 1358
|
||||
real_server:
|
||||
192.168.200.2 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
# Must be a list because of multiple URL entries.
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
192.168.200.3 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334c
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334c
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
10.10.10.3 1358:
|
||||
delay_loop: 3
|
||||
lb_algo: rr
|
||||
lb_kind: NAT
|
||||
nat_mask: 255.255.255.0
|
||||
persistence_timeout: 50
|
||||
protocol: TCP
|
||||
real_server:
|
||||
192.168.200.4 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
192.168.200.5 1358:
|
||||
weight: 1
|
||||
HTTP_GET:
|
||||
- url:
|
||||
path: /testurl/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl2/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- url:
|
||||
path: /testurl3/test.jsp
|
||||
digest: 640205b7b0fc66c1ea91c463fac6334d
|
||||
- connect_timeout: 3
|
||||
- nb_get_retry: 3
|
||||
- delay_before_retry: 3
|
||||
vrrp_script:
|
||||
check_apache:
|
||||
script: '"killall -0 apache"'
|
||||
interval: 2
|
||||
weight: 10
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
#!/bin/sh
|
||||
|
||||
###############################################################################
|
||||
# (A) Update `FORMULA` with `${nextRelease.version}`
|
||||
###############################################################################
|
||||
sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
|
||||
|
||||
|
||||
###############################################################################
|
||||
# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
|
||||
###############################################################################
|
||||
|
||||
# Install `m2r`
|
||||
sudo -H pip install m2r
|
||||
|
||||
# Copy and then convert the `.md` docs
|
||||
cp *.md docs/
|
||||
cd docs/
|
||||
m2r --overwrite *.md
|
||||
|
||||
# Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
|
||||
sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
|
||||
sed -i -e '1,4s/-/=/g' CHANGELOG.rst
|
||||
|
||||
# Use for debugging output, when required
|
||||
# cat AUTHORS.rst
|
||||
# cat CHANGELOG.rst
|
||||
|
||||
# Return back to the main directory
|
||||
cd ..
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
// No release is triggered for the types commented out below.
|
||||
// Commits using these types will be incorporated into the next release.
|
||||
//
|
||||
// NOTE: Any changes here must be reflected in `CONTRIBUTING.md`.
|
||||
module.exports = [
|
||||
{breaking: true, release: 'major'},
|
||||
// {type: 'build', release: 'patch'},
|
||||
// {type: 'chore', release: 'patch'},
|
||||
// {type: 'ci', release: 'patch'},
|
||||
{type: 'docs', release: 'patch'},
|
||||
{type: 'feat', release: 'minor'},
|
||||
{type: 'fix', release: 'patch'},
|
||||
{type: 'perf', release: 'patch'},
|
||||
{type: 'refactor', release: 'patch'},
|
||||
{type: 'revert', release: 'patch'},
|
||||
{type: 'style', release: 'patch'},
|
||||
{type: 'test', release: 'patch'},
|
||||
];
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
module.exports = {
|
||||
branch: 'master',
|
||||
plugins: [
|
||||
['@semantic-release/commit-analyzer', {
|
||||
preset: 'angular',
|
||||
releaseRules: './release-rules.js',
|
||||
}],
|
||||
'@semantic-release/release-notes-generator',
|
||||
['@semantic-release/changelog', {
|
||||
changelogFile: 'CHANGELOG.md',
|
||||
changelogTitle: '# Changelog',
|
||||
}],
|
||||
['@semantic-release/exec', {
|
||||
prepareCmd: 'sh ./pre-commit_semantic-release.sh ${nextRelease.version}',
|
||||
}],
|
||||
['@semantic-release/git', {
|
||||
assets: ['*.md', 'docs/*.rst', 'FORMULA'],
|
||||
}],
|
||||
'@semantic-release/github',
|
||||
],
|
||||
generateNotes: {
|
||||
preset: 'angular',
|
||||
writerOpts: {
|
||||
// Required due to upstream bug preventing all types being displayed.
|
||||
// Bug: https://github.com/conventional-changelog/conventional-changelog/issues/317
|
||||
// Fix: https://github.com/conventional-changelog/conventional-changelog/pull/410
|
||||
transform: (commit, context) => {
|
||||
const issues = []
|
||||
|
||||
commit.notes.forEach(note => {
|
||||
note.title = `BREAKING CHANGES`
|
||||
})
|
||||
|
||||
// NOTE: Any changes here must be reflected in `CONTRIBUTING.md`.
|
||||
if (commit.type === `feat`) {
|
||||
commit.type = `Features`
|
||||
} else if (commit.type === `fix`) {
|
||||
commit.type = `Bug Fixes`
|
||||
} else if (commit.type === `perf`) {
|
||||
commit.type = `Performance Improvements`
|
||||
} else if (commit.type === `revert`) {
|
||||
commit.type = `Reverts`
|
||||
} else if (commit.type === `docs`) {
|
||||
commit.type = `Documentation`
|
||||
} else if (commit.type === `style`) {
|
||||
commit.type = `Styles`
|
||||
} else if (commit.type === `refactor`) {
|
||||
commit.type = `Code Refactoring`
|
||||
} else if (commit.type === `test`) {
|
||||
commit.type = `Tests`
|
||||
} else if (commit.type === `build`) {
|
||||
commit.type = `Build System`
|
||||
// } else if (commit.type === `chore`) {
|
||||
// commit.type = `Maintenance`
|
||||
} else if (commit.type === `ci`) {
|
||||
commit.type = `Continuous Integration`
|
||||
} else {
|
||||
return
|
||||
}
|
||||
|
||||
if (commit.scope === `*`) {
|
||||
commit.scope = ``
|
||||
}
|
||||
|
||||
if (typeof commit.hash === `string`) {
|
||||
commit.hash = commit.hash.substring(0, 7)
|
||||
}
|
||||
|
||||
if (typeof commit.subject === `string`) {
|
||||
let url = context.repository
|
||||
? `${context.host}/${context.owner}/${context.repository}`
|
||||
: context.repoUrl
|
||||
if (url) {
|
||||
url = `${url}/issues/`
|
||||
// Issue URLs.
|
||||
commit.subject = commit.subject.replace(/#([0-9]+)/g, (_, issue) => {
|
||||
issues.push(issue)
|
||||
return `[#${issue}](${url}${issue})`
|
||||
})
|
||||
}
|
||||
if (context.host) {
|
||||
// User URLs.
|
||||
commit.subject = commit.subject.replace(/\B@([a-z0-9](?:-?[a-z0-9/]){0,38})/g, (_, username) => {
|
||||
if (username.includes('/')) {
|
||||
return `@${username}`
|
||||
}
|
||||
|
||||
return `[@${username}](${context.host}/${username})`
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// remove references that already appear in the subject
|
||||
commit.references = commit.references.filter(reference => {
|
||||
if (issues.indexOf(reference.issue) === -1) {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
})
|
||||
|
||||
return commit
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
control 'Keepalived configuration' do
|
||||
title 'should match desired lines'
|
||||
|
||||
describe file('/etc/keepalived/keepalived.conf') do
|
||||
# Default config
|
||||
its('content') { should include 'smtp_server 192.168.200.1' }
|
||||
|
||||
# Custom config from pillar
|
||||
its('content') { should include 'acassen@firewall.loc' }
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
control 'Keepalived package' do
|
||||
title 'should be installed'
|
||||
|
||||
describe package('keepalived') do
|
||||
it { should be_installed }
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name: keepalived
|
||||
title: Keepalived Formula
|
||||
maintainer: Nicolas Rodriguez
|
||||
license: Apache-2.0
|
||||
summary: Verify that the keepalived formula is setup and configured correctly
|
||||
supports:
|
||||
- os-name: debian
|
||||
- os-name: ubuntu
|
||||
- os-name: centos
|
||||
- os-name: fedora
|
||||
- os-name: opensuse
|
||||
- os-name: suse
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
|
||||
import os, unittest
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
|
||||
class TestKeepalivedConfiguration(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.t_dir = os.path.abspath(os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
os.pardir,
|
||||
'keepalived',
|
||||
'templates'))
|
||||
self.t_conf = Environment(loader=FileSystemLoader(self.t_dir),
|
||||
trim_blocks=True)
|
||||
|
||||
def renderTest(self, data, result):
|
||||
holder = self.t_conf.get_template('test_config.jinja').render(testdata=data)
|
||||
output = repr(holder) + ' did not equal ' + repr(result)
|
||||
self.assertEqual(holder, result, output)
|
||||
|
||||
def test_string(self):
|
||||
testdata = 'stuff'
|
||||
result = 'stuff\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_number(self):
|
||||
testdata = 3
|
||||
result = '3\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_null(self):
|
||||
testdata = None
|
||||
result = '\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_key_value_pair(self):
|
||||
testdata = {'flintstone': 'fred'}
|
||||
result = 'flintstone fred\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_key_array_pair(self):
|
||||
testdata = {'flintstone': ['fred', 'wilma', 'pebbles']}
|
||||
result = 'flintstone {\n fred\n wilma\n pebbles\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_key_hash_pair(self):
|
||||
testdata = {'friends': {'rubble': 'barney'}}
|
||||
result = 'friends {\n rubble barney\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_key_ordered_hashs(self):
|
||||
testdata = {'friends': {'fred': 'flintstone', 'barney': 'rubble', 'wilma': 'flintstone', 'betty': 'rubble'}}
|
||||
result = 'friends {\n barney rubble\n betty rubble\n fred flintstone\n wilma flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_ordered_hashes(self):
|
||||
testdata = [{'fred': 'flintstone'}, {'wilma': 'flintstone'}, {'barney': 'rubble'}, {'betty': 'rubble'}]
|
||||
result = 'fred flintstone\nwilma flintstone\nbarney rubble\nbetty rubble\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover(self):
|
||||
testdata = {'vrrp_script': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'vrrp_script gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_contains_arry(self):
|
||||
testdata = {'vrrp_script': {'gizmo': [{'fred': 'flintstone'}, {'barney': 'rubble'}]}}
|
||||
result = 'vrrp_script gizmo {\n fred flintstone\n barney rubble\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_vrrp_instance(self):
|
||||
testdata = {'vrrp_instance': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'vrrp_instance gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryovers_in_an_array(self):
|
||||
testdata = [{'vrrp_script': {'gizmo': {'running': 'dumdums'}}}, {'vrrp_instance': {'dumdums': {'fred': 'flintstone'}}}]
|
||||
result = 'vrrp_script gizmo {\n running dumdums\n}\nvrrp_instance dumdums {\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_vrrp_sync_group(self):
|
||||
testdata = {'vrrp_sync_group': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'vrrp_sync_group gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_virtual_server_group(self):
|
||||
testdata = {'virtual_server_group': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'virtual_server_group gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_virtual_server(self):
|
||||
testdata = {'virtual_server': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'virtual_server gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_real_server(self):
|
||||
testdata = {'real_server': {'gizmo': {'fred': 'flintstone', 'barney': 'rubble'}}}
|
||||
result = 'real_server gizmo {\n barney rubble\n fred flintstone\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_carryover_within_carryover(self):
|
||||
testdata = {'virtual_server': {'gizmo': {'real_server': {'dumdums': {'fred': 'flintstone', 'barney': 'rubble'}}}}}
|
||||
result = 'virtual_server gizmo {\n real_server dumdums {\n barney rubble\n fred flintstone\n }\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_indent_nested_hashes(self):
|
||||
testdata = {'flintstone': {'fred': {'role': {'family': 'father'}}}}
|
||||
result = 'flintstone {\n fred {\n role {\n family father\n }\n }\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
def test_indent_carryover_with_nested_hashes(self):
|
||||
testdata = {'real_server': {'gizmo': {'another': 'day', 'dumdums': {'fred': 'flintstone', 'barney': 'rubble'}}}}
|
||||
result = 'real_server gizmo {\n another day\n dumdums {\n barney rubble\n fred flintstone\n }\n}\n'
|
||||
self.renderTest(testdata, result)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Loading…
Reference in New Issue