浏览代码

update readme

master
Arnold Bechtoldt 9 年前
父节点
当前提交
9477f3e7d7
共有 4 个文件被更改,包括 66 次插入61 次删除
  1. +0
    -4
      AUTHORS
  2. +56
    -54
      README.rst
  3. +10
    -0
      meta.yaml
  4. +0
    -3
      update-docs

+ 0
- 4
AUTHORS 查看文件

@@ -1,4 +0,0 @@
Alan Pearce <alan@alanpearce.co.uk>
Arnold Bechtoldt <mail@arnoldbechtoldt.com>
Simon Lloyd <simon@slloyd.net>
root <root@saltmaster01.(none)>

+ 56
- 54
README.rst 查看文件

@@ -2,85 +2,87 @@
saltstack-network-formula
=========================

.. image:: https://api.flattr.com/button/flattr-badge-large.png
:target: https://flattr.com/submit/auto?user_id=bechtoldt&url=https%3A%2F%2Fgithub.com%2Fbechtoldt%2Fsaltstack-network-formula

Salt Stack Formula to set up and configure a host's network configuration
.. image:: https://img.shields.io/badge/flattr-donate-red.svg
:alt: Donate via flattr
:target: https://flattr.com/profile/bechtoldt

NOTICE BEFORE YOU USE
=====================
.. image:: https://img.shields.io/gratipay/bechtoldt.svg
:alt: Donate via Gratipay
:target: https://www.gratipay.com/bechtoldt/

* This formula aims to follow the conventions and recommendations described at http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#conventions-formula and http://docs.saltstack.com/en/latest/topics/best_practices.html
.. image:: https://img.shields.io/badge/license-Apache--2.0-blue.svg
:alt: Apache-2.0-licensed
:target: https://github.com/bechtoldt/saltstack-network-formula/blob/master/LICENSE

TODO
====
.. image:: https://img.shields.io/badge/gitter-chat-brightgreen.svg
:alt: Join Chat
:target: https://gitter.im/bechtoldt/saltstack-network-formula?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

* Use more of the available options in interfaces.sls of network.managed
* interfaces: configure broadcast if set
SaltStack Formula to set up and configure a host&#39;s network configuration

Instructions
============
.. contents::
:backlinks: none
:local:

1. Add this repository as a `GitFS <http://docs.saltstack.com/topics/tutorials/gitfs.html>`_ backend in your Salt master config.

2. Configure your Pillar top file (``/srv/pillar/top.sls``) and your pillars, see pillar.example.sls
Instructions
------------

3. Include this Formula within another Formula or simply define your needed states within the Salt top file (``/srv/salt/top.sls``).
Please refer to https://github.com/bechtoldt/formula-docs to learn how to use
this formula, how it is built and how you can add your changes.

Available states
================
**NOTICE:** This formula might uses the formhelper module which is a very useful Salt execution module that isn't available
in upstream yet. Please consider retrieving it manually from https://github.com/bechtoldt/salt-modules and
make it available to your Salt installation. Read `SaltStack documentation <http://docs.saltstack.com/en/latest/ref/modules/#modules-are-easy-to-write>`_ to
see how this can be achieved.

Take a look at older `releases <https://github.com/bechtoldt/saltstack-network-formula/releases>`_ to get a version that isn't using the formhelper
yet (if any).

.. contents::
:local:

``network.hosts``
-----------------
Sets the static lookup table for hostnames
Contributing
------------

``network.interfaces``
----------------------
Sets the network interfaces configuration
Contributions are welcome! All development guidelines we ask you to follow can
be found at https://github.com/bechtoldt/formula-docs.

``network.resolver``
--------------------
Sets the resolver configuration
In general:

``network.routes``
------------------
Manages network routes
1. Fork this repo on Github
2. Add changes, test them, update docs (README.rst) if possible
3. Submit your pull request (PR) on Github, wait for feedback

Additional resources
====================
But it’s better to `file an issue <https://github.com/bechtoldt/saltstack-network-formula/issues/new>`_ with your idea first.

None

Formula Dependencies
====================
Authors
-------

None
* Alan Pearce <alan@alanpearce.co.uk>
* Arnold Bechtoldt <mail@arnoldbechtoldt.com>
* Simon Lloyd <simon@slloyd.net>
* root <root@saltmaster01.(none)>

Contributions
=============

Contributions are always welcome. All development guidelines you have to know are
TODO
----

* write clean code (proper YAML+Jinja syntax, no trailing whitespaces, no empty lines with whitespaces, LF only)
* set sane default settings
* test your code
* update README.rst doc
* add instructions how to use formhelper, add information about it in the formula-docs (dependency), show up alternative?
* table/ matrix: os/salt compatibility (dedicated file)
* add list of available states
* add tests
* Use more of the available options in interfaces.sls of network.managed
* interfaces: configure broadcast if set

Salt Compatibility
==================

Tested with:
Miscellaneous
-------------

* 2014.1
* 2014.7
Recommended formulas:

OS Compatibility
================
* SaltStack management: `saltstack-salt-formula <https://github.com/bechtoldt/saltstack-salt-formula>`_

Tested with:
Further reading:

* GNU/ Linux Debian Wheezy
* CentOS 6 (not completly tested)
* Documentation and Standardisation of SaltStack formulas: https://github.com/bechtoldt/formula-docs

+ 10
- 0
meta.yaml 查看文件

@@ -0,0 +1,10 @@
name: saltstack-network-formula
source: https://github.com/bechtoldt/saltstack-network-formula
summary: SaltStack Formula to set up and configure a host's network configuration
todo:
- add instructions how to use formhelper, add information about it in the formula-docs (dependency), show up alternative?
- 'table/ matrix: os/salt compatibility (dedicated file)'
- add list of available states
- add tests
- Use more of the available options in interfaces.sls of network.managed
- 'interfaces: configure broadcast if set'

+ 0
- 3
update-docs 查看文件

@@ -1,3 +0,0 @@
#!/bin/bash

git log --format='%aN <%aE>' | sort -u > AUTHORS

正在加载...
取消
保存