Commit Graph

294 Commits

Author SHA1 Message Date
Henry Wang
abd651558c w 2019-08-29 11:04:19 +08:00
Henry Wang
cfa2dc95ea change back 2019-08-29 11:00:51 +08:00
Henry Wang
8ca3c28c95 atstst 2019-08-29 10:50:18 +08:00
Henry Wang
4974eefc64 correct IP addresses 2019-08-29 10:05:46 +08:00
Henry Wang
4e81d0f07d test2 2019-08-29 10:04:07 +08:00
Henry Wang
e5e9cefeab 1 2019-08-29 10:00:03 +08:00
Henry Wang
5187b1dbd5 correct 2019-08-29 09:55:53 +08:00
Henry Wang
271d8f7c61 Add Optional 2019-08-29 09:48:16 +08:00
Henry Wang
8859d51629 Correctness 2019-08-29 09:41:29 +08:00
Henry Wang
507d8798d8 Add LoadBalancer Profile 2019-08-29 09:36:11 +08:00
Henry Wang
0980b482a4 Type Correction 2019-08-29 08:59:35 +08:00
Henry Wang
002fe8258a Add HaProxy Module with dependent modules 2019-08-29 08:58:28 +08:00
Henry Wang
afea0979ff Put All Hiera Values for Tune Setting 2019-08-28 23:04:30 +08:00
Henry Wang
e408957bad test Commit 2019-08-28 21:43:08 +08:00
Ben Ford
bee4fc2740
Create CODEOWNERS 2019-08-21 13:58:51 -07:00
Reid Vandewiele
dddbd8d15c (maint) Update Puppetfile versions, update style
This commit updates the Puppetfile example module versions to list the
latest releases for the example modules as of 2019-07-10, and also
updates several files for style.

Standardizing on double-quotes in YAML due to:

1. Functional irrelevance between single vs. double quotes in our YAML
2. Prevalent use of double-quotes in Puppet documentation
3. Similar look-and-feel to other data serialization formats like JSON
2019-07-11 09:33:14 -07:00
adam buxton
535d94437b
Merge pull request #73 from natemccurdy/site_pp_updates
Update outdated info and links in site.pp comments
2019-05-14 20:47:31 +01:00
Nate McCurdy
a8c6d51264
Update outdated info and links in site.pp comments
This commit attempts to cleanup and modernize the comments in site.pp a
bit.

For one thing, I've updated the docs links to point to working URL's.
For another, I tried to reorganize, clarify, and deduplicate the comments.
2019-05-06 17:36:50 -05:00
Reid Vandewiele
306107b98b
Merge pull request #71 from npwalker/rename_site_to_site-modules
Rename site directory to site-modules
2019-02-26 15:26:47 -08:00
Reid Vandewiele
c74c84d243 Update README to reflect site -> site-modules 2019-02-26 09:14:15 -08:00
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
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