Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make theforeman/git a soft dependency #234

Merged
merged 1 commit into from
Feb 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,33 @@ Puppet 3.6+ and config environments on older versions. These are set up under
/etc/puppet/environments/ - change `server_environments` to define the list to
create, or use `puppet::server::env` for more control.

## Git repo support with theforeman/git
## Git repo support

Environments can be backed by git by setting `server_git_repo` to true, which
sets up `/var/lib/puppet/puppet.git` where each branch maps to one environment.
Avoid using 'master' as this name isn't permitted. On each push to the repo, a
hook updates `/etc/puppet/environments` with the contents of the branch.

## Foreman integration with theforeman/foreman
Requires [theforeman/git](https://forge.puppetlabs.com/theforeman/git).

With the 3.0.0 release the Foreman integration became optional. Note that you
need the [theforeman/foreman module](https://github.com/theforeman/puppet-foreman)
installed.
## Foreman integration

It will still by default install the Foreman integration when `server` is true,
With the 3.0.0 release the Foreman integration became optional. It will still
by default install the Foreman integration when `server` is true,
so if you wish to run a Puppet master without Foreman, it can be disabled by
setting `server_foreman` to false.

## PuppetDB integration with puppetlabs/puppetdb
Requires [theforeman/foreman](https://forge.puppetlabs.com/theforeman/foreman).

## PuppetDB integration

The Puppet master can be configured to export catalogs and reports to a
PuppetDB instance, using the puppetlabs/puppetdb module. Use its
`puppetdb::server` class to install PuppetDB and this module to configure the
Puppet master.

Requires [puppetlabs/puppetdb](https://forge.puppetlabs.com/puppetlabs/puppetdb).

# Installation

Available from GitHub (via cloning or tarball), [Puppet Forge](https://forge.puppetlabs.com/theforeman/puppet)
Expand Down
1 change: 0 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"tags": ["foreman", "puppet", "puppetmaster", "puppet-server"],
"dependencies": [
{ "name": "theforeman/concat_native", "version_requirement": ">= 1.3.0 < 2.0.0" },
{ "name": "theforeman/git", "version_requirement": ">= 1.3.0 < 2.0.0" },
{ "name": "puppetlabs/apache", "version_requirement": ">= 1.2.0 < 2.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 2.0.0 < 5.0.0" }
],
Expand Down