Commit Graph

155 Commits

Author SHA1 Message Date
Igor Galić
9a13af11c6
point "forge" to new canonical URL, with https 2017-11-27 21:41:11 +01:00
Nate McCurdy
4aa1446323
Merge pull request #53 from reidmv/hiera5
Enable Hiera 5
2017-11-16 15:58:30 -08:00
Nate McCurdy
53d4c56136
Merge pull request #54 from jdesroch/patch-1
Typo fix in README.md
2017-11-15 10:31:59 -08:00
Jody Des Roches
6a887aff94
Update README.md
Small typo fix
2017-11-15 08:28:23 -10:00
Reid Vandewiele
7264b63d10 Enable Hiera 5
This commit enables the control repo to use Hiera 5 environment-level
hiera hierarchy. This means adding a hiera.yaml to the repo, and moving
hieradata/ => data/.

We should do this to the control-repo template new customers base off of
because in a Hiera 5 world, the global hiera.yaml should be very minimal
(possibly even ONLY having the console level), and everything else
(nodes, common) belongs in the environment hiera.yaml.

This control-repo template is how people start using Puppet. It should
reflect using our most modern technologies.
2017-11-15 09:24:40 -08:00
Nate McCurdy
05d7620962 Merge pull request #51 from puppetlabs/whitespace_error
Reverting whitespace commit
2017-09-06 16:39:53 -07:00
Shobhna Shastri
4c0ea09e19 Reverting whitespace commit
There was an accidental commit made on the production branch (d877ba22b6). This commit is to correct and revert the change.
2017-09-06 16:37:30 -07:00
Shobhna Shastri
d877ba22b6 Testing something 2017-08-25 14:06:56 -07:00
Gabriel M. Schuyler
ee0e87de27 Merge pull request #50 from natemccurdy/show_master
config_version: Show the compiling master's name
2017-07-05 17:17:57 -07:00
Nate McCurdy
124b1a2727 config_version: Show the compiling master's name
Prior to this, the config_version script just showed the commit ID of
the version of code being compiled. This commit includes the compiling
Puppet master's hostname and environment name in the config_version.
This is very useful for debugging when a Puppet master is failing and
you have multiple masters behind a load balancer.

The output of config_version now looks like this:

pupmaster01-production-ac9785273a10
2017-07-05 17:09:51 -07:00
Nate McCurdy
ac9785273a Merge pull request #44 from aharden/patch-2
Put local site modules first in modulepath
2017-06-02 17:14:19 -05:00
Nick Walker
c9931ceef7 Add ruby shebang to config_version scripts
Prior to this commit, if you used windows bash git when you clone
down the repo these files would get incorrect permissions which
make them unexecutable.

After this commit, due to some windows bash git magic I don't
understand it appears that adding the shebang to the beginning of
the file causes windows bash git to change the permissions to
so the file is executable.

This resolves https://github.com/puppetlabs/control-repo/issues/40
2016-11-22 13:20:15 -08:00
Nate McCurdy
fcab12f772 Merge pull request #46 from aharden/patch-1
Add GitHub instructions
2016-11-08 11:34:09 -08:00
Alex Harden
d2a890ceae Add GitHub instructions
Per Issue https://github.com/puppetlabs/control-repo/issues/26
2016-11-08 13:47:29 -05:00
Alex Harden
c26b42aa43 Put local site modules first in modulepath
Saw this issue referenced in @glarizza's PuppetConf 2016 talk (raised by @alvagante). Our (TE Connectivity) implementation reflects this.
2016-11-08 12:57:46 -05:00
Alex Harden
b6af290069 Provide permalink for filebucket deprecation (#43)
"Latest" stopped resolving several PE releases ago.
2016-10-26 07:46:56 -07:00
Nick Walker
5497d199b3 Remove max_requests_per_instance since hiera-eyaml is fixed
Prior to this commit, we mitigated issues with hiera-eyaml causing
a memory leak by setting max_requets_per_instance to 0

After this commit, we go back to the default for
max_requests_per_instance because the hiera-eyaml memory leak
has been resolved for months if you use the newest version
2016-08-04 15:51:07 -07:00
Nick Walker
e0d6feea18 Merge pull request #38 from reidmv/fix_cm_perms
Set the execute bit for CM config version script
2016-06-29 08:38:27 -07:00
Reid Vandewiele
d340dd2288 Set the execute bit for CM config version script
The execute bit needs to be set or CM will fail.

I think this was probably just missed when the
code_manager_config_version.rb file was added.
2016-06-29 15:42:23 +01:00
Nick Walker
e8361dd21c Merge pull request #37 from dylanratcliffe/remove-role
Remove old role all_in_one_pe
2016-06-15 10:02:38 -07:00
Dylan Ratcliffe
aa2dba158b Removed old role 2016-06-14 14:37:43 +10:00
Nick Walker
b9d9eb0bb3 Update README with new Ramp Up Program URL 2016-05-27 10:37:55 -07:00
Gary Larizza
01346d7d21 Merge pull request #32 from jbondpdx/production
light editing, mostly for style
2016-05-11 16:27:10 -07:00
jbondpdx
cd17888a90 light editing, mostly for style 2016-05-11 15:30:53 -07:00
Gary Larizza
3f94dafcd9 Merge pull request #27 from npwalker/reduce_scope_of_control_repo
Reduce the scope of the control-repo to mostly an example
2016-03-29 16:36:03 -07:00
Gary Larizza
6a44737d04 Merge pull request #28 from npwalker/move_profiles_out_into_their_own_modules
Move profiles out into their own modules
2016-03-29 16:22:26 -07:00
Nick Walker
2c98a9264c Reduce the scope of the control-repo to mostly an example
Prior to this commit, the control-repo was an example of the
structure of a control repo but it also included puppet code to
help setup code manager and instructions to get that all setup
in a very specific way.

This was great for users that wanted to follow those instructions
exactly but wasn't great for people just looking for an example to
start from.

After this commit, the control-repo will be just an example once
again and a new repo somehwere else will pop up to provide the
explicit instructions on how to use the example with code manager.

There are links added to puppetlabs/control-repo to a new repo
that will have a version of the code that once lived in
puppetlabs/control-repo
2016-03-29 15:53:10 -07:00
Nick Walker
b3519dd48c Move stash profile out to its own 'profile' module
Prior to this commit, there was a stash profile in the site dir
of this control-repo.

After this commit, the profile has been moved to it's own repo
where it can be used more generally and not tightly coupled to this
repository.
2016-03-24 14:07:16 -07:00
Nick Walker
ff6f140529 Move gitlab profile out to its own 'profile' module
Prior to this commit, there was a gitlab profile in the site dir
of this control-repo.

After this commit, the profile has been moved to it's own repo
where it can be used more generally and not tightly coupled to this
repository.

As a result, the gitlab role has been removed from this repository
as well.
2016-03-24 08:27:17 -07:00
Nick Walker
9503f54349 Move puppetmaster profile to rampup_profile_puppetmaster module
Prior to this commit, the puppetmaster profile was embedded in this
control-repo.

After this commit, the puppetmaster profile is moved out into its
own module.
2016-03-23 15:55:58 -07:00
Nick Walker
55f983ffc9 Update npwalker/pe_code_manager_webhook to 1.0.3 2016-03-23 14:44:26 -07:00
Nick Walker
5185a4cb26 Clean up some stale files
Prior to this commit, these two files were laying around but not used.
The code manager template was missed when the code was moved into
a module and the function was added a while ago but then never
put to use.

After this commit, the codebase is a little lighter without these
stale files.
2016-03-23 10:22:02 -07:00
Gary Larizza
667c77892a Merge pull request #22 from npwalker/breakout_git_webhook_into_a_module
Move profile::git_webhook into seperate module pe_code_manager_webhook
2016-03-17 14:38:12 -07:00
Nick Walker
4978905d9b Update to pe_code_manager_webhook v1.0.2 2016-03-17 14:34:40 -07:00
Nick Walker
182f947418 Update to pe_code_manager_wehbook v1.0.1 2016-03-17 14:34:40 -07:00
Nick Walker
bd13252916 Update to pe_code_manager_webhook v1.0.0
Prior to this commit, we were using a pre-release version of the
pe_code_manager_webhook module in order to test that simply
re-namespacing the module form a profile to a module worked as
expected.

After this commit, we use the official 1.0.0 relase of the module
that includes a few changes that make it more versatile.
2016-03-17 14:34:40 -07:00
Nick Walker
00d3aa1f4f Move profile::git_webhook into seperate module pe_code_manager_webhook
Prior to this commit the functionality to setup the either code
manager or zack/r10k was tightly coupled to this control-repo. In
an effort to make that functionality useful to more people we're
splitting it into a dedicated module.

After this commit, the pe_code_manager_webhook module will contain all logic
around setting up the webhook while this control-repo will still
gloss over the details needed to get everything in PE setup correctly
to use that module.

This commit removes the files associated with the profile including
some custom functions that were only there to make it work.

This commit removes the all_in_one_pe_2015_2 role as it was exactly
the same as the all_in_one_pe role.

This commit modifies all_in_one_pe to use the pe_code_manager_webhook module
instead of the profile.
2016-03-17 14:33:01 -07:00
Nate McCurdy
d250d971b9 Merge pull request #18 from stjeanp/production
Fixed code so hunner/hiera can be pulled from forge
2016-03-15 09:36:46 -07:00
Gary Larizza
4de1ccc7c1 Merge pull request #20 from npwalker/disable_max_requests_per_instance_setting
Disable max-requests-per-instance to mitigate hiera-eyaml mem leak
2016-02-25 09:39:07 -06:00
Nick Walker
35be376131 Merge pull request #21 from cvquesty/production
Corrected documentation grammar.
2016-02-24 14:12:40 -08:00
Jerald Sheets
7b5f052442 Corrected documentation grammar. 2016-02-24 16:42:00 -05:00
Nick Walker
270bf0a53a Disable max-requests-per-instance to mitigate hiera-eyaml mem leak
Hiera-eyaml currently causes a memory leak in puppetsever when
max-requests-per-instnace is enabled. So, defaulting to disabling
max-requests-per-instance.

https://tickets.puppetlabs.com/browse/SERVER-1154
https://github.com/TomPoulton/hiera-eyaml/issues/163
2016-02-24 11:47:27 -08:00
Nate McCurdy
e79b5277ce Merge pull request #19 from pjmorr/patch-1
Update all_in_one_pe_2015_2.pp
2016-02-22 13:48:53 -08:00
Philip Morrison
d5032cbb67 Update all_in_one_pe_2015_2.pp
Shouldn't this be profile::git_webhook as in all_in_one_pe.pp since the abstraction logic is located there?
Either that or the profile::zack_r10k_webook is missing from the location specified?
2016-02-14 00:58:19 -05:00
Patrick St. Jean
7f967d1f8b Changed :latest to 2.0.1 for hunner/hiera 2016-02-04 14:22:40 -06:00
Patrick St. Jean
b415200eb0 Fixed code so hunner/hiera can be pulled from forge 2016-02-04 11:34:52 -06:00
Nate McCurdy
36737bb5fc Merge pull request #15 from npwalker/fix_hostname_in_role_curl
Fix hostname on role creation curl command
2016-01-27 15:08:18 -08:00
Nick Walker
3f22ce0ae7 Fix hostname on role creation curl command
Prior to the this commit, if you were using the code_manager
profile on a split install it would incorrectly try to curl the
NC api on the master node.

After this commit, it should correctly curl the hostname of the NC

This has no impact on the functionality of the code on a monolithic
PE installation.
2016-01-12 09:32:06 -08:00
Gary Larizza
323b4b9386 Merge pull request #12 from npwalker/move_hiera_config_setting
Move hiera_config to main section of puppet.conf
2016-01-11 09:23:19 -08:00
Nick Walker
508b9cc600 Move hiera_config to main section of puppet.conf
If it is in master instead of main then puppet apply will give a
warning.
2016-01-06 15:26:08 -08:00