Separate scripts to be installed on puppetmaster from those that are installed on foreman server #2
Conversation
We shouldn't make the assumption that foreman runs on the same hosts as the puppetmaster. So this patch separates the scripts that are to be installed on the puppetmaster (enc & report script) into the class foreman::puppetmaster that can be added to the puppetmaster. Change-Id: I89b0439d18c1e4032b64c12c337de51958e7f1ab
| @@ -49,6 +49,5 @@ | |||
| } | |||
|
|
|||
| if $foreman::params::reports { include foreman::config::reports } | |||
| if $foreman::params::enc { include foreman::config::enc } | |||
There was a problem hiding this comment.
should this be part of the configuration params? that you wont be required users to add a requirement to add the puppetmaster class?
looks good!
There was a problem hiding this comment.
On Thu, Apr 26, 2012 at 10:04, Ohad Levy
reply@reply.github.com
wrote:
@@ -49,6 +49,5 @@
}if $foreman::params::reports { include foreman::config::reports }
- if $foreman::params::enc { include foreman::config::enc }
should this be part of the configuration params? that you wont be required
users to add a requirement to add the puppetmaster class?
Well, possibly you could use it only for reports and not as ENC. But
yes, maybe move it directly into the foreman::puppetmaster class
instead of having that one include foreman::config::enc if that's what
you mean?
Erik Dalén
There was a problem hiding this comment.
where do you include the foreman::puppetmaster class? in the puppet server class instead?
There was a problem hiding this comment.
On Thu, Apr 26, 2012 at 19:55, Ohad Levy
reply@reply.github.com
wrote:
@@ -49,6 +49,5 @@
}if $foreman::params::reports { include foreman::config::reports }
- if $foreman::params::enc { include foreman::config::enc }
where do you include the foreman::puppetmaster class? in the puppet server class instead?
Yes, although I already had a class for my puppetmaster with some
other stuff in it as well so I didn't use the foreman-installer module
for that. But I can fix it there as well and send a patch for it,
definitely makes sense to fix that there.
Erik Dalén
There was a problem hiding this comment.
great :) as in its current form it would break people who install it from here.
Thanks!
There was a problem hiding this comment.
I sent a pull request for that as well now. Sorry for the delay.
There was a problem hiding this comment.
Thanks @dalen - I'll test both pull-req's together tonight, but it looks pretty good at a glance :)
Separate scripts to be installed on puppetmaster from those that are installed on foreman server
|
Merged,. Sorry for the delay, and thanks! |
Resync with theforeman's github
Use SCLed paths in Foreman vhost template
Sync with upstream for Foreman 1.3.0 release. Though I have no intention of moving this branch further and instead try to get https://github.com/ekohl/puppet-foreman/tree/puppetlabs-apache-v2 in working and mergeable shape, but in the mean time I'm fine with merging this.
Separate scripts to be installed on puppetmaster from those that are installed on foreman server
Master forked to "oldstable" for older puppet users Merged to master
We shouldn't make the assumption that foreman runs on the same hosts as the
puppetmaster.
So this patch separates the scripts that are to be installed on the
puppetmaster (enc & report script) into the class foreman::puppetmaster
that can be added to the puppetmaster.