Commit Graph

228 Commits

Author SHA1 Message Date
Reid Vandewiele
baa4b92a88 Remove symlink site -> site-modules
The symlink served for a good discussion point around change impact, but
in the end having it makes for a more confusing experience overall both
to new users cloning the control-repo to get started and also to anyone
accustomed to "site". A new user won't miss "site". A symlink will muddy
the waters over the change for long-time users. Better for clarity to be
all-in and not include a symlink.
2019-02-26 09:14:15 -08:00
Nick Walker
80494c198b Add symlink from site to site-modules for compatibility 2019-02-04 13:04:11 -08:00
Nick Walker
ead7f3c706 Rename site directory to site-modules
Prior to this commit, we placed modules local to a users installation
in the `site` directory.  This was just a convention and the name
`site` doesn't clearly convey what it is for.

After this commit, we place modules local to a users installation in
the `site-modules` directory.  This makes it more clear to users
that this is a directory that modules go i.  When users start
with bolt they won't even know what a control-repo is and
renaming site to site-modules gives them a better idea of why
they should put their modules with tasks in them.  Also see:

https://tickets.puppetlabs.com/browse/BOLT-1108
2019-01-31 16:58:13 -08:00
Craig Sprout
18aa0779ae Fixed typos for 'moduelpath' and 'batteries includes' to 'modulepath' and 'batteries included' 2018-12-07 14:08:09 -08:00
Romain Tartière
415a71dd59 Remove code dead for more than 2 years
r10k generates a .r10k-deploy.json file since version 2.1.0 which was
released on October 28, 2015.  New users of the control-repo are not
likely to have a so old version of r10k, so remove this dead code.
2018-05-11 22:28:40 +02:00
Romain Tartière
211ecc58b5 Do sanity checking early
Fail before doing anything when passed parameters are invalid.
2018-05-11 22:26:49 +02:00
Romain Tartière
61d0147e49 Remove execute permission and shebangs
The appropriate ruby interpreter is determined by the config_version.sh
shell script which explicitely use it to start these ruby scripts.
Removing the execute bit ensure users will not run these script with the
wrong Ruby version.
2018-05-11 22:26:49 +02:00
Romain Tartière
ffc1769d2e Improve portability
- Fix shebang: `bash` is not always in `/bin/`, and since the script
  does not have bashism, rely on `sh` which is always in `/bin/`;
- Use `/opt/puppetlabs/puppet/bin/ruby` if this file exist and is
  executable, otherwise use `ruby` from $PATH;
- Use `code_manager_config_version.rb` if `.r10k-deploy.json` is found,
  and `config_version.rb` in all other cases.
2018-05-11 22:25:27 +02:00
Nate McCurdy
f69ffd8ce1 Update module examples to latest versions 2018-05-08 10:46:30 -07:00
Nate McCurdy
36a2784275 Resolve Rubocop warnings
* Removed the useless assignment in the config_version.rb error catching
* Single quote vs. double quote in Puppetfile
2018-05-08 10:46:30 -07:00
Nate McCurdy
aaa85a0e03
Merge pull request #57 from natemccurdy/config_version
Config Version Improvements
2018-05-08 10:43:35 -07:00
Nate McCurdy
78662f908d
Merge pull request #61 from natemccurdy/readme_markdown
Improve the README
2018-03-13 18:43:43 -07:00
Nate McCurdy
bab3453bb5 Simplify the info about the RampUp Program 2018-03-13 13:47:19 -07:00
Nate McCurdy
fda0396e06 Add a tree view with descriptions of important files 2018-02-06 17:35:34 -08:00
Nate McCurdy
c69edaddda Reorganize the README and improve the documentation
This commit moves the "where did all the previous code go" section to
the bottom as it's been a while since that change was made. Nowadays,
people new to Control Repositories will find this and won't understand
the reference as they never knew about previous versions.

Now the README starts right away with information on what this project
is and how to use it.

Also cleaned up some of the Markdown syntax to make it easier to read.
2018-02-06 17:35:34 -08:00
Nate McCurdy
9b2a0d9029 Fix markdown list syntax 2018-02-06 15:59:51 -08:00
Nate McCurdy
cbeb86670a
Merge pull request #59 from petems/add_bitbucket_instructions
Add Bitbucket/Stash instructions
2018-02-01 11:11:55 -08:00
Peter Souter
096719d759 Add Bitbucket/Stash instructions 2018-02-01 19:10:43 +00:00
Nate McCurdy
e5189b5515 Show the short hostname, not the FQDN in config_version
This is mainly a style and readability change.

Prior to this, on masters whose hostname is actually their FQDN, the
config_version script would show the entire FQDN. On nodes with really
longs FQDN's, it was not very nice to look at.

This takes the hostname of the master, splits it on dots (.) and takes
the first segment.

Now this: compile-master-02.int.lab.dmz.company-name.net-production-48fd18ab
Is this:  compile-master-02-production-48fd18ab
2017-12-15 12:52:14 -06:00
Nate McCurdy
09df4b4961 Use the puppet-agent ruby in config_version.rb
Prior to this, the config_version.rb script (used for r10k) attempted to
use the system ruby to parse the script. This caused problems on Puppet
masters that don't have `ruby` in PATH.

This fixes that by hardcoding the puppet-agent's ruby in the shebang.
2017-12-15 12:48:47 -06:00
Federico Voges
c221d72929
Merge pull request #56 from natemccurdy/gitignore
Ignore modules pulled from r10k
2017-11-28 00:15:38 +00:00
Nate McCurdy
0069299d6f Ignore modules pulled from r10k into modules/
Prior to this, modules that were deployed with r10k into the ./modules
directory weren't being ignored by git.

When doing local development or testing, it's nice to be able to run
'r10k puppetfile install' to pull down modules from the Puppetfile.
After this commit, those modules won't be tracked by git.
2017-11-27 19:08:54 -05:00
Nate McCurdy
c89b8d7ef8
Merge pull request #55 from igalic/patch-1
point "forge" to new canonical URL, with https
2017-11-27 19:06:06 -05:00
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