Skip to content

Commit

Permalink
Merge pull request #406 from loles/docs
Browse files Browse the repository at this point in the history
Fix sphinx warninngs
  • Loading branch information
pigmej committed Dec 2, 2015
2 parents 8e16f1a + 83e8c61 commit 77dcb63
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/source/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ configure OpenStack Nova API service.
of this example.
Step 1: Find an appropriate puppet module
++++++++++++++++++++++++++++++++++++++++
+++++++++++++++++++++++++++++++++++++++++

The `Puppet OpenStack <https://wiki.openstack.org/wiki/Puppet>`_
module for `Nova <https://github.com/openstack/puppet-nova>`_
Expand Down
5 changes: 2 additions & 3 deletions doc/source/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ transition and type of event.
Right now we are supporting 2 types of events:

1. Dependency - inserts edge between 2 changes into the deployment plan.
2. Reaction - inserts change specified in reaction and makes edge between
parent and child.
2. Reaction - inserts change specified in reaction and makes edge between parent and child.

Example ::

Expand Down Expand Up @@ -138,7 +137,7 @@ After action that is related to change will be executed - it will be moved to
history with same uuid.

Committed resource data
----------------------
-----------------------
After each successful change committed copy of resource data will be updated
with diff of that change.

Expand Down
6 changes: 2 additions & 4 deletions doc/source/resource.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ Solar currently supports following handlers:

* puppet - first version of puppet handler (legacy, will be deprecated soon)
* puppetv2 - second, improved version of puppet, supporting hiera integration
* ansible_playbook - first version of ansible handler (legacy, will be
deprecated soon)
* ansible_template - second generation of ansible implementation, includes
transport support
* ansible_playbook - first version of ansible handler (legacy, will be deprecated soon)
* ansible_template - second generation of ansible implementation, includes transport support

Handlers are pluggable, so you can write your own easily to extend
functionality of Solar. Interesting examples might be Chef, SaltStack,
Expand Down

0 comments on commit 77dcb63

Please sign in to comment.