Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
puppetlabs/marionette-collective
Agi199/marionette-collective
AlexanderPavlenko/marionette-collective
AsherBond/marionette-collective
CNXTEoEorg/marionette-collective
Huron-City-Schools/marionette-collective
Iristyle/marionette-collective
LabattFoodService/marionette-collective
MFredette/marionette-collective
Magisus/marionette-collective
MaxMartin/marionette-collective
McdonaldSeanp/marionette-collective
MichelleJaeg/marionette-collective
MosesMendoza/marionette-collective
RubyTuesdayDONO/marionette-collective
ScottGarman/marionette-collective
Servana/marionette-collective
Sharpie/marionette-collective
UcasRichard/marionette-collective
XANi/marionette-collective
abelletti/marionette-collective
adamgibbins/marionette-collective
adamhjk/marionette-collective
adreyer/marionette-collective
adrienthebo/marionette-collective
ahpook/marionette-collective
alcy/marionette-collective
alexjfisher/marionette-collective
avisheksarkar20/marionette-collective
ayaz/marionette-collective
beergeek/marionette-collective
beezly/marionette-collective
bheusinkveld/marionette-collective
bladealslayer/marionette-collective
bmlrmdev/marionette-collective
bobtfish/marionette-collective
branan/marionette-collective
brianwawok/marionette-collective
brothers/marionette-collective
bw-y/marionette-collective
camilo-schoeningh-sociomantic/marionette-collective
caseywilliams/marionette-collective
ccaum/marionette-collective
cherubines/marionette-collective
chjohnst/marionette-collective
cicloid/marionette-collective
clantant/marionette-collective
conkiztador/marionette-collective
crazed/marionette-collective
crekev/marionette-collective
croomes/marionette-collective
databus23/marionette-collective
dduvnjak/marionette-collective
denmat/marionette-collective
dforste/marionette-collective
digital-science/marionette-collective
drewrm/marionette-collective
ekinanp/marionette-collective
elmer/marionette-collective
er0ck/marionette-collective
ericalthatcher/marionette-collective
eschizoid/marionette-collective
evilensky/marionette-collective
ferventcoder/marionette-collective
fiddyspence/marionette-collective
gazetaj/marionette-collective
georgiou/marionette-collective
gerricchaplin/marionette-collective
gguillotte/marionette-collective
glarizza/marionette-collective
glennsarti/marionette-collective
gregretkowski/marionette-collective
haf/marionette-collective
halfninja/marionette-collective
hawknewton/marionette-collective
heathseals/marionette-collective
hickey/marionette-collective
hilli/marionette-collective
holguinj/marionette-collective
hyfather/marionette-collective
ingardm/marionette-collective
j2sh/marionette-collective
jasperla/marionette-collective
jayendren/marionette-collective
jaytaph/marionette-collective
jbondpdx/marionette-collective
jbussdieker/marionette-collective
jdw112/marionette-collective
jeffmccune/marionette-collective
jessereynolds/marionette-collective
johnduarte/marionette-collective
josb-ebaysf/marionette-collective
joshcooper/marionette-collective
jsane/marionette-collective
jstangroome/marionette-collective
jtappa/marionette-collective
jtimberman/marionette-collective
justcfx2u/marionette-collective
justinstoller/marionette-collective
justinwyer/marionette-collective
jweiss/marionette-collective
kbarber/marionette-collective
keocra/marionette-collective
khadrin/marionette-collective
kiall/marionette-collective
kleopatra999/marionette-collective
leet1976/marionette-collective
macjacktw/marionette-collective
maguec/marionette-collective
mamackenzie/marionette-collective
mateusz-gozdek-sociomantic/marionette-collective
matthewbarr/marionette-collective
mburger/marionette-collective
mcanevet/marionette-collective
mdxp/marionette-collective
melissa/marionette-collective
meowtochondria/marionette-collective
mfournier/marionette-collective
mgeggie/marionette-collective
mikepea/marionette-collective
mmrobins/marionette-collective
morshEtoro/marionette-collective
mosadev/marionette-collective
mpagalan/marionette-collective
mruzicka/marionette-collective
mstine/marionette-collective
msutter/marionette-collective
mwaggett/marionette-collective
ncdc/marionette-collective
netdata-be/marionette-collective
nfagerlund/marionette-collective
nhooey/marionette-collective
nicklewis/marionette-collective
nicksellen/marionette-collective
nigelkersten/marionette-collective
ody/marionette-collective
onejli/marionette-collective
optionalg/marionette-collective
oswell/marionette-collective
pandian912/marionette-collective
paperplane/marionette-collective
parisiale/marionette-collective
peterhuene/marionette-collective
phobos182/marionette-collective
phuong3030/marionette-collective
piavlo/marionette-collective
pimpajr/marionette-collective
pizzaops/marionette-collective
ploubser/marionette-collective
pmialon/marionette-collective
raphink/marionette-collective
reguero/marionette-collective
reidmv/marionette-collective
relistan/marionette-collective
rgevaert/marionette-collective
richardc/marionette-collective
ripienaar/marionette-collective
rlinehan/marionette-collective
robertgstoehl/marionette-collective
robinbowes/marionette-collective
rockwithyou/marionette-collective
romke/marionette-collective
rondinelisaad/marionette-collective
rottenbytes/marionette-collective
sarameisburger/marionette-collective
sborsje/marionette-collective
shance3c/marionette-collective
shawnferry/marionette-collective
sheldonh/marionette-collective
shishir/marionette-collective
shraddhagore/marionette-collective
shrug/marionette-collective
sikhosonke-manyela/marionette-collective
simonpasquier/marionette-collective
skottler/marionette-collective
sliranc/marionette-collective
someword/marionette-collective
spandeyindia/marionette-collective-1
spidie/marionette-collective
stahnma/marionette-collective
tampakrap/marionette-collective
tarhashi/marionette-collective
teancom/marionette-collective
tetsusoh/marionette-collective
thedeeno/marionette-collective
timbyr/marionette-collective
torrancew/marionette-collective
traylenator/marionette-collective
tremble/marionette-collective
trlinkin/marionette-collective
underscorgan/marionette-collective
ustuehler/marionette-collective
vaibhav-walke/marionette-collective
vicglarson/marionette-collective
vinaykotla/marionette-collective
viviallddn/marionette-collective
wfarr/marionette-collective
xepa/marionette-collective
yo61/marionette-collective
zaargy/marionette-collective
Nothing to show
Choose a base branch
Choose a Head Repository
puppetlabs/marionette-collective
Agi199/marionette-collective
AlexanderPavlenko/marionette-collective
AsherBond/marionette-collective
CNXTEoEorg/marionette-collective
Huron-City-Schools/marionette-collective
Iristyle/marionette-collective
LabattFoodService/marionette-collective
MFredette/marionette-collective
Magisus/marionette-collective
MaxMartin/marionette-collective
McdonaldSeanp/marionette-collective
MichelleJaeg/marionette-collective
MosesMendoza/marionette-collective
RubyTuesdayDONO/marionette-collective
ScottGarman/marionette-collective
Servana/marionette-collective
Sharpie/marionette-collective
UcasRichard/marionette-collective
XANi/marionette-collective
abelletti/marionette-collective
adamgibbins/marionette-collective
adamhjk/marionette-collective
adreyer/marionette-collective
adrienthebo/marionette-collective
ahpook/marionette-collective
alcy/marionette-collective
alexjfisher/marionette-collective
avisheksarkar20/marionette-collective
ayaz/marionette-collective
beergeek/marionette-collective
beezly/marionette-collective
bheusinkveld/marionette-collective
bladealslayer/marionette-collective
bmlrmdev/marionette-collective
bobtfish/marionette-collective
branan/marionette-collective
brianwawok/marionette-collective
brothers/marionette-collective
bw-y/marionette-collective
camilo-schoeningh-sociomantic/marionette-collective
caseywilliams/marionette-collective
ccaum/marionette-collective
cherubines/marionette-collective
chjohnst/marionette-collective
cicloid/marionette-collective
clantant/marionette-collective
conkiztador/marionette-collective
crazed/marionette-collective
crekev/marionette-collective
croomes/marionette-collective
databus23/marionette-collective
dduvnjak/marionette-collective
denmat/marionette-collective
dforste/marionette-collective
digital-science/marionette-collective
drewrm/marionette-collective
ekinanp/marionette-collective
elmer/marionette-collective
er0ck/marionette-collective
ericalthatcher/marionette-collective
eschizoid/marionette-collective
evilensky/marionette-collective
ferventcoder/marionette-collective
fiddyspence/marionette-collective
gazetaj/marionette-collective
georgiou/marionette-collective
gerricchaplin/marionette-collective
gguillotte/marionette-collective
glarizza/marionette-collective
glennsarti/marionette-collective
gregretkowski/marionette-collective
haf/marionette-collective
halfninja/marionette-collective
hawknewton/marionette-collective
heathseals/marionette-collective
hickey/marionette-collective
hilli/marionette-collective
holguinj/marionette-collective
hyfather/marionette-collective
ingardm/marionette-collective
j2sh/marionette-collective
jasperla/marionette-collective
jayendren/marionette-collective
jaytaph/marionette-collective
jbondpdx/marionette-collective
jbussdieker/marionette-collective
jdw112/marionette-collective
jeffmccune/marionette-collective
jessereynolds/marionette-collective
johnduarte/marionette-collective
josb-ebaysf/marionette-collective
joshcooper/marionette-collective
jsane/marionette-collective
jstangroome/marionette-collective
jtappa/marionette-collective
jtimberman/marionette-collective
justcfx2u/marionette-collective
justinstoller/marionette-collective
justinwyer/marionette-collective
jweiss/marionette-collective
kbarber/marionette-collective
keocra/marionette-collective
khadrin/marionette-collective
kiall/marionette-collective
kleopatra999/marionette-collective
leet1976/marionette-collective
macjacktw/marionette-collective
maguec/marionette-collective
mamackenzie/marionette-collective
mateusz-gozdek-sociomantic/marionette-collective
matthewbarr/marionette-collective
mburger/marionette-collective
mcanevet/marionette-collective
mdxp/marionette-collective
melissa/marionette-collective
meowtochondria/marionette-collective
mfournier/marionette-collective
mgeggie/marionette-collective
mikepea/marionette-collective
mmrobins/marionette-collective
morshEtoro/marionette-collective
mosadev/marionette-collective
mpagalan/marionette-collective
mruzicka/marionette-collective
mstine/marionette-collective
msutter/marionette-collective
mwaggett/marionette-collective
ncdc/marionette-collective
netdata-be/marionette-collective
nfagerlund/marionette-collective
nhooey/marionette-collective
nicklewis/marionette-collective
nicksellen/marionette-collective
nigelkersten/marionette-collective
ody/marionette-collective
onejli/marionette-collective
optionalg/marionette-collective
oswell/marionette-collective
pandian912/marionette-collective
paperplane/marionette-collective
parisiale/marionette-collective
peterhuene/marionette-collective
phobos182/marionette-collective
phuong3030/marionette-collective
piavlo/marionette-collective
pimpajr/marionette-collective
pizzaops/marionette-collective
ploubser/marionette-collective
pmialon/marionette-collective
raphink/marionette-collective
reguero/marionette-collective
reidmv/marionette-collective
relistan/marionette-collective
rgevaert/marionette-collective
richardc/marionette-collective
ripienaar/marionette-collective
rlinehan/marionette-collective
robertgstoehl/marionette-collective
robinbowes/marionette-collective
rockwithyou/marionette-collective
romke/marionette-collective
rondinelisaad/marionette-collective
rottenbytes/marionette-collective
sarameisburger/marionette-collective
sborsje/marionette-collective
shance3c/marionette-collective
shawnferry/marionette-collective
sheldonh/marionette-collective
shishir/marionette-collective
shraddhagore/marionette-collective
shrug/marionette-collective
sikhosonke-manyela/marionette-collective
simonpasquier/marionette-collective
skottler/marionette-collective
sliranc/marionette-collective
someword/marionette-collective
spandeyindia/marionette-collective-1
spidie/marionette-collective
stahnma/marionette-collective
tampakrap/marionette-collective
tarhashi/marionette-collective
teancom/marionette-collective
tetsusoh/marionette-collective
thedeeno/marionette-collective
timbyr/marionette-collective
torrancew/marionette-collective
traylenator/marionette-collective
tremble/marionette-collective
trlinkin/marionette-collective
underscorgan/marionette-collective
ustuehler/marionette-collective
vaibhav-walke/marionette-collective
vicglarson/marionette-collective
vinaykotla/marionette-collective
viviallddn/marionette-collective
wfarr/marionette-collective
xepa/marionette-collective
yo61/marionette-collective
zaargy/marionette-collective
Nothing to show
Choose a head branch
Commits on Feb 04, 2015
Commits on Feb 05, 2015
Commits on Feb 10, 2015
(docs) Add YAML frontmatter to two pages missing it
These pages weren't appearing on the docs site as .html pages.
(docs) Adjust header levels in several plugin_directory files for bet…
…ter TOCs

Our TOC generator only uses H2 and H3 tags, expecting that there's only going to
be one H1 for the page.
Commits on Feb 11, 2015
Fix warning on mcollective start-up when running under systemd
When starting mcollective under systemd on CentOS 7 I was seeing this
message:

Feb 11 00:35:07 ip-10-169-74-156 systemd: Starting The Marionette Collective...
Feb 11 00:35:08 ip-10-169-74-156 systemd: mcollective.service: Supervising process 6520 which is not our child. We'll most likely not notice when it exits.
Feb 11 00:35:08 ip-10-169-74-156 systemd: Started The Marionette Collective.

This was because mcollectived was configured to daemonize and the
systemd unit file specified a "forking" service.

It is better to not daemonize services under systemd as it enabled them
to be more reliably monitored.

This PR converts the mcollective systemd service to type "simple" and doesn't
daemonize the mcollectived daemon on startup.
Merge pull request #295 from yo61/fix-systemd-unit-file
Fix warning on mcollective start-up when running under systemd
Commits on Feb 19, 2015
Commits on Feb 20, 2015
(maint) update plugin paths post MCO-583
Some of the documentation for extension points refers to core
plugins.  These moved as part of MCO-583 but the documentation was
overlooked.  Here we update those links.
Commits on Mar 11, 2015
Commits on Mar 22, 2015
Geoff Nichols
Geoff Nichols
(RE-3977) Remove runlevel 4 from Default-Start for SUSE
Apparently runlevel 4 is not used on SUSE, so we remove
it from Default-Start. We also move runlevel 2 to
Default-Stop for consistency with our puppet packaging.
Commits on Mar 23, 2015
Merge pull request #304 from geoffnichols/RE-3977/master/remove_runle…
…vel_4_for_suse

(RE-3977) Remove runlevel 4 from Default-Start for SUSE
(maint) pin systemu on ruby 1.8
As per ahoward/systemu#41 systemu's ruby
support policy is "whatever Ruby version is officially supported
at the point in time of the release"

For 1.8 pin to systemu 2.6.4, which is the last known working version
for 1.8
Commits on Apr 13, 2015
(maint) Remove Fedora 19 from build targets
Fedora 19 went EOL on 2015-01-06. We should not longer be providing
packages for this platform.
Commits on Apr 14, 2015
Merge pull request #308 from melissa/maint/master/rm-f19
(maint) Remove Fedora 19 from build targets
Commits on Apr 23, 2015
(maint) Remove lucid from build targets
Ubuntu 10.04 (Lucid Lynx) goes EoL 2015-04-30, and as such, we no longer
want to be building packages for this platform.

https://lists.ubuntu.com/archives/ubuntu-announce/2015-March/000193.html
Commits on May 04, 2015
(MCO-646) Add launchd plist for use with OSX AIO
This commit adds a launchd plist for use with OSX AIO packaging.
Merge pull request #312 from heathseals/mco-646
(MCO-646) Add launchd plist for use with OSX AIO
Commits on May 08, 2015
MCO-647 downgrade warning for missing libdir to debug
Since MCO-583 it's entirely possible to have a working MCollective
install with no additional plugins in the libdir, so warning is less
appropriate than before.

Here we downgrade the warning to a debug message.
MCO-647 let the user know where we search for applications
Here we check if mco was called with an application name.  If it was, and we
don't have it, we now more clearly state that we don't have it and where we
would have looked in order to find the applications.

This results in output like:

    $ mco notping
    The Marionette Collective version 2.8.1

    Unknown command 'notping', searched for applications in:

        /Users/richardc/src/mcollective/lib
        /Users/richardc/.gem/ruby/1.9.3/gems/stomp-1.3.4/lib
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/site_ruby/1.9.1
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/site_ruby/1.9.1/x86_64-darwin13.4.0
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/site_ruby
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/vendor_ruby/1.9.1
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/vendor_ruby/1.9.1/x86_64-darwin13.4.0
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/vendor_ruby
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/1.9.1
        /opt/rubies/ruby-1.9.3-p547/lib/ruby/1.9.1/x86_64-darwin13.4.0
        /Users/richardc/src/mcollective/lib/mcollective/vendor/systemu/lib

    Known commands:

        completion           facts                find
        help                 inventory            ping
        plugin               rpc

    Type './bin/mco help' for a detailed list of commands and './bin/mco help command'
    to get detailed help for a command
MCO-641 add the 'classic' libdirs to aio sample config
Here we add the two divergent 'default' libdirs from the pre-aio repathing as
search paths to the example configuration file.  This demonstrates the ability
to consult the classic paths in addition to the new standard pathing.
Merge pull request #314 from richardc/MCO-641-aio-default-libdirs
MCO-641 add the 'classic' libdirs to aio sample config
MCO-640 exit nonzero if a command can not be found
Here we change the exitcode of `mco somecommand` when `somecommand` can not be
found to indicate the error condition of a missing application.
Merge pull request #315 from richardc/MCO-640-no_command_exitcode
MCO-640 exit nonzero if a command can not be found
Commits on May 12, 2015
(maint) Do not build stable or testing
Currently, we are being redundant with which debian platforms we are
building. Debian has releases that correspond to certain names that
indicate where they are in the release lifecycle. For instance, at this
moment, Debian Jessie is the same this as Debian Stable. As they
progress the different releases through their respective lifecycles, the
codename corresponding to the lifecycle stage changes. For instance,
currently, Debian Testing corresponds to Debian Stretch. At some point,
this platform will drop, and become the new Debian Stable, and Debian
Jessie will become the new Debian Oldstable. Rather than continually
updating our packages to deal with these changes every time the Debian
release cycle is moved forward, we will only be building packages based
on Codename (i.e., Debian Wheezy).

In order to follow these new standards, this commit removes both stable
and testing from the build targets. That, and MCO 2.x will not be
released on either Debian Jessie or Debian Stretch. These two platforms
instead will see releases throught the puppet-agent packages.
Commits on May 14, 2015
Commits on Jun 04, 2015
John Duarte
John Duarte
(MCO-671) Add acceptance boilerplate from puppet
This commit adds the boilerplate infrastructure for running
beaker acceptance tests against a project. The contents of
this commit were copied from the puppetlabs/puppet project.
richardc and John Duarte
add the basic for an mco ping
This is just activemq, port 61613, well known credentials, no PSK.
richardc and John Duarte
Add a README.md
As we add TLS/SSL configuration, this will grow
John Duarte
John Duarte
(MCO-671) Updated support files for acceptance tests
This commit adds beaker pre-suite files to install jdk, amq,
mco, and puppet-agent-plugin for acceptance testing.

It also adds config files with pathing for Windows.

mco_ping and mco_puppet_count tests are included as an initial
smoke test.
Commits on Jun 05, 2015
(MCO-668) Add quotes to query language scanner
Here we add the concept of quotes to the query language scanner,
allowing us to tokenise strings like "this is a long string" and
"/slashes/in/hizzouse".

This is used on the cli like:

```
$ mco rpc rpcutil ping -S 'operatingsystem="This very long string"'
(MCO-668) Add describe_filter application
Here we add an action that will display a human readable interpretation
of the supplied filters.

```
$ mco describe_filter -C foo -C bar -F fact=value -S 'foo=bar and (bar = foo)'
-F filter expands to the following fact comparisons:

  Check if fact 'fact' == 'value'

-C filter expands to the following class checks:

  Check if class 'foo' is present on the host
  Check if class 'bar' is present on the host

-S Query expands to the following instructions:

  Check if fact 'foo' = 'bar'
  AND
  (
    Check if fact 'bar' = 'foo'
  )
```
Merge pull request #318 from johnduarte/acceptance
(MCO-671) Add acceptance tests to mco
Commits on Jun 23, 2015
John Duarte
John Duarte
(MAINT) Add mco_master role to acceptance
This commit adds an `mco_master` role to the beaker host files,
as well as using this role in the tests and pre-suit files to
determine where to deploy the mco-broker infrastructure.

Since the `mco_master` role can be applied to any node in the
hosts lists, the `server.cfg` file has been added to the
`060_Install-activemq.rb` pre-suite step as a parameterized
HEREDOC string.
Commits on Jun 24, 2015
Commits on Jun 25, 2015
John Duarte
John Duarte
(MAINT) fix puppet bin location on win 32bit
This commit fixes the puppet command path on Windows 32bit
architectures in the 060_Install-activemq.rb acceptance test
pre-suite.
Commits on Jun 26, 2015
John Duarte
John Duarte
(MAINT) Split mco install step, rm unused cfg files
This commit splits the aio pre-suite step `060_Install-activemq.rb`
into `050_Install-activemq.rb` and
`060_Install-mcollective-daemon.rb` in order to prevent conflating
these two steps.

Also, since the server.cfg files are templated in this step, the
corresponding static files in the files directory are no longer
used. This commit also deletes them.
Commits on Jun 29, 2015
Merge pull request #324 from jtappa/email_alias_changes
(DOC-2043): change mentions of faq@ to docs@puppetlabs.com
Commits on Jul 02, 2015
Commits on Jul 03, 2015
Merge pull request #325 from jtappa/DOC-2092_repo-links
(docs) DOC-2092:Use https for links to package repos
Commits on Jul 07, 2015
Merge pull request #323 from johnduarte/fix_x86_puppet_bin
(MAINT) fix puppet bin location on win 32bit
John Duarte
John Duarte
(MCOP-521) mco runonce with powershell provider test
This commit adds an acceptance test to verify that executing
a `mco puppet runonce` where a Windows agent is classified
with an exec resource that uses the powershell provider correctly
executes on the Windows system.

This test is currently expected to fail until MCOP-521 is resolved.
The test assertion is wrapped in an `expect_failure` method to
prevent the test run from turning red until MCOP-521 has been fixed.
At that time, the test will fail and the wrapper can be removed to
flip the result.
Merge pull request #322 from johnduarte/mcop-521
(MCOP-521) mco runonce with powershell provider test
Commits on Jul 13, 2015
Commits on Jul 14, 2015
Merge pull request #326 from heathseals/maint/plist_set_encoding
(maint) set character encoding environment variable in the osx plist
Commits on Jul 16, 2015
John Duarte
John Duarte
(MAINT) Fixup Windows elements in powershell test
This commit replaces the hard-coded client_datadir with a puppet
configprint for this value.

This commit also corrects a logical error in the arch and ruby_arch
combination that would result in the mco bindir being located under
"C:\Program Files (x86)".
Merge pull request #327 from johnduarte/maint-powershell-fixup
(MAINT) Fixup Windows elements in powershell test
Commits on Jul 17, 2015
(RE-5032) fully qualify the label in the osx mco plist
This commit fully qualifies the label in the osx mco plist using the
identifier plus service name.
Merge pull request #328 from heathseals/tickets/master/re-5032
(RE-5032) fully qualify the label in the osx mco plist
Commits on Jul 20, 2015
Commits on Aug 05, 2015
(MCO-687) Add solaris smf service for mcollective for AIO
This commit adds an smf service file for mcollective, based on the PE
service file with updates for the AIO FS layout.
Commits on Aug 06, 2015
geoffnichols
geoffnichols
Merge pull request #331 from haus/ticket/master/mco-687
(MCO-687) Add solaris smf service for mcollective for AIO
Commits on Aug 14, 2015
Commits on Aug 17, 2015
Commits on Aug 20, 2015
(MCO-705) revert "(RE-5032) fully qualify the label in the osx mco pl…
…ist"

Reverts puppetlabs/marionette-collective#328

We realized that changing this name actually changes the service name,
which impacts anyone trying to manage the service - such as PE. This
seems high-impact for a patch release.
Merge pull request #335 from MikaelSmith/bug/master/MCO-705
(MCO-705) revert "(RE-5032) fully qualify the label in the osx mco pl…
(maint) Call out the change from #326
One of the important changes in 2.8.3 was actually a (maint) PR, so it hadn't
been summarised into the 2.8.3 changelog.

Call it out now as it's important given we reverted it in RE-5032.
Showing with 3,607 additions and 120 deletions.
  1. +6 −1 Gemfile
  2. +1 −1 README
  3. +3 −0 acceptance/.gitignore
  4. +27 −0 acceptance/Gemfile
  5. +46 −0 acceptance/README.md
  6. +372 −0 acceptance/Rakefile
  7. +17 −0 acceptance/config/aio/options.rb
  8. +20 −0 acceptance/config/nodes/centos-5-x86_64.yaml
  9. +20 −0 acceptance/config/nodes/centos-6-x86_64.yaml
  10. +20 −0 acceptance/config/nodes/debian-6-x86_64.yaml
  11. +20 −0 acceptance/config/nodes/debian-7-x86_64.yaml
  12. +20 −0 acceptance/config/nodes/debian-8-x86_64.yaml
  13. +20 −0 acceptance/config/nodes/fedora-20-x86_64.yaml
  14. +20 −0 acceptance/config/nodes/fedora-21-x86_64.yaml
  15. +20 −0 acceptance/config/nodes/redhat-5-x86_64.yaml
  16. +20 −0 acceptance/config/nodes/redhat-6-x86_64.yaml
  17. +20 −0 acceptance/config/nodes/redhat-7-x86_64.yaml
  18. +20 −0 acceptance/config/nodes/ubuntu-1204-x86_64.yaml
  19. +20 −0 acceptance/config/nodes/ubuntu-1404-x86_64.yaml
  20. +20 −0 acceptance/config/nodes/ubuntu-1410-x86_64.yaml
  21. +21 −0 acceptance/config/nodes/win2003r2x64-rubyx64.yaml
  22. +21 −0 acceptance/config/nodes/win2003r2x64-rubyx86.yaml
  23. +21 −0 acceptance/config/nodes/win2003r2x86-rubyx86.yaml
  24. +21 −0 acceptance/config/nodes/win2003x64-rubyx64.yaml
  25. +21 −0 acceptance/config/nodes/win2003x64-rubyx86.yaml
  26. +21 −0 acceptance/config/nodes/win2003x86-rubyx86.yaml
  27. +21 −0 acceptance/config/nodes/win2008-rubyx64.yaml
  28. +21 −0 acceptance/config/nodes/win2008-rubyx86.yaml
  29. +21 −0 acceptance/config/nodes/win2008r2-rubyx64.yaml
  30. +21 −0 acceptance/config/nodes/win2008r2-rubyx86.yaml
  31. +21 −0 acceptance/config/nodes/win2012-rubyx64.yaml
  32. +21 −0 acceptance/config/nodes/win2012-rubyx86.yaml
  33. +21 −0 acceptance/config/nodes/win2012r2-rubyx64.yaml
  34. +21 −0 acceptance/config/nodes/win2012r2-rubyx86.yaml
  35. BIN acceptance/files/activemq.keystore
  36. BIN acceptance/files/activemq.truststore
  37. +182 −0 acceptance/files/activemq.xml
  38. +32 −0 acceptance/files/ca_crt.pem
  39. +24 −0 acceptance/files/client.cfg
  40. +32 −0 acceptance/files/client.crt
  41. +51 −0 acceptance/files/client.key
  42. +32 −0 acceptance/files/server.crt
  43. +51 −0 acceptance/files/server.key
  44. +24 −0 acceptance/files/windows-client.cfg
  45. +8 −0 acceptance/lib/acceptance_spec_helper.rb
  46. +1 −0 acceptance/lib/helper.rb
  47. +144 −0 acceptance/lib/puppet/acceptance/common_utils.rb
  48. +19 −0 acceptance/lib/puppet/acceptance/git_utils.rb
  49. +195 −0 acceptance/lib/puppet/acceptance/install_utils.rb
  50. +79 −0 acceptance/setup/aio/pre-suite/010_Install.rb
  51. +1 −0 acceptance/setup/aio/pre-suite/015_PackageHostsPresets.rb
  52. +3 −0 acceptance/setup/aio/pre-suite/045_EnsureMasterStartedOnPassenger.rb
  53. +99 −0 acceptance/setup/aio/pre-suite/050_Install-activemq.rb
  54. +90 −0 acceptance/setup/aio/pre-suite/060_Install-mcollective-daemon.rb
  55. +27 −0 acceptance/setup/aio/pre-suite/070_Install_puppet-agent-plugin.rb
  56. +9 −0 acceptance/setup/common/pre-suite/025_StopFirewall.rb
  57. +6 −0 acceptance/setup/common/pre-suite/040_ValidateSignCert.rb
  58. +93 −0 acceptance/setup/common/pre-suite/070_InstallCACerts.rb
  59. +1 −0 acceptance/setup/common/pre-suite/110_SetPEPuppetService.rb
  60. +16 −0 acceptance/ssl/ca/ca_crl.pem
  61. +32 −0 acceptance/ssl/ca/ca_crt.pem
  62. +51 −0 acceptance/ssl/ca/ca_key.pem
  63. +14 −0 acceptance/ssl/ca/ca_pub.pem
  64. +5 −0 acceptance/ssl/ca/inventory.txt
  65. +1 −0 acceptance/ssl/ca/private/ca.pass
  66. +1 −0 acceptance/ssl/ca/serial
  67. +31 −0 acceptance/ssl/ca/signed/activemq.pem
  68. +32 −0 acceptance/ssl/ca/signed/mcollective-client.pem
  69. +32 −0 acceptance/ssl/ca/signed/mcollective-server.pem
  70. +32 −0 acceptance/ssl/ca/signed/socks.local.pem
  71. +31 −0 acceptance/ssl/certs/activemq.pem
  72. +32 −0 acceptance/ssl/certs/ca.pem
  73. +32 −0 acceptance/ssl/certs/mcollective-client.pem
  74. +32 −0 acceptance/ssl/certs/mcollective-server.pem
  75. +32 −0 acceptance/ssl/certs/socks.local.pem
  76. +16 −0 acceptance/ssl/crl.pem
  77. +51 −0 acceptance/ssl/private_keys/activemq.pem
  78. +51 −0 acceptance/ssl/private_keys/mcollective-client.pem
  79. +51 −0 acceptance/ssl/private_keys/mcollective-server.pem
  80. +51 −0 acceptance/ssl/private_keys/socks.local.pem
  81. +14 −0 acceptance/ssl/public_keys/activemq.pem
  82. +14 −0 acceptance/ssl/public_keys/mcollective-client.pem
  83. +14 −0 acceptance/ssl/public_keys/mcollective-server.pem
  84. +14 −0 acceptance/ssl/public_keys/socks.local.pem
  85. +12 −0 acceptance/tests/mco_ping.rb
  86. +12 −0 acceptance/tests/mco_puppet_count.rb
  87. +118 −0 acceptance/tests/mco_puppet_powershell.rb
  88. +25 −2 bin/mco
  89. +6 −0 ext/aio/common/client.cfg.dist
  90. +6 −0 ext/aio/common/server.cfg.dist
  91. +30 −0 ext/aio/osx/mcollective.plist
  92. +44 −0 ext/aio/solaris/smf/mcollective.xml
  93. +2 −2 ext/aio/suse/mcollective.init
  94. +2 −2 ext/build_defaults.yaml
  95. +2 −2 ext/redhat/mcollective.service
  96. +1 −1 lib/mcollective.rb
  97. +1 −1 lib/mcollective/aggregate/average.ddl
  98. +87 −0 lib/mcollective/application/describe_filter.rb
  99. +1 −1 lib/mcollective/config.rb
  100. +47 −5 lib/mcollective/matcher/scanner.rb
  101. +1 −1 lib/mcollective/optionparser.rb
  102. +36 −0 spec/unit/mcollective/matcher/scanner_spec.rb
  103. +19 −0 website/changelog.md
  104. +1 −1 website/deploy/install.md
  105. +5 −5 website/deploy/middleware/activemq.md
  106. +1 −0 website/plugin_directory/agent_file_manager.markdown
  107. +1 −0 website/plugin_directory/agent_iptables_junk_filter.markdown
  108. +1 −0 website/plugin_directory/agent_metadata.markdown
  109. +5 −5 website/plugin_directory/agent_registration_mongodb.markdown
  110. +3 −3 website/plugin_directory/agent_registration_monitor.markdown
  111. +1 −0 website/plugin_directory/authorization_action_policy.markdown
  112. +7 −11 website/plugin_directory/central_rpc_log.markdown
  113. +7 −0 website/plugin_directory/discovery_assisted_ssh.markdown
  114. +2 −1 website/plugin_directory/facter.markdown
  115. +9 −9 website/plugin_directory/facter_via_yaml.markdown
  116. +12 −12 website/plugin_directory/index.markdown
  117. +2 −1 website/plugin_directory/logstash_rpc_audit_logs.markdown
  118. +1 −0 website/plugin_directory/net_test.markdown
  119. +3 −2 website/plugin_directory/none.markdown
  120. +2 −0 website/plugin_directory/nrpe_agent.markdown
  121. +8 −8 website/plugin_directory/ohai.markdown
  122. +1 −0 website/plugin_directory/package.markdown
  123. +3 −3 website/plugin_directory/packages.markdown
  124. +4 −4 website/plugin_directory/process_management.markdown
  125. +1 −0 website/plugin_directory/puppet_agent.markdown
  126. +8 −12 website/plugin_directory/puppet_ca.markdown
  127. +2 −2 website/plugin_directory/registration_metadata.markdown
  128. +1 −0 website/plugin_directory/resources_data_plugin.markdown
  129. +1 −0 website/plugin_directory/services.markdown
  130. +10 −11 website/plugin_directory/stomp_util.markdown
  131. +7 −3 website/plugin_directory/sysctl_data.markdown
  132. +1 −1 website/reference/basic/gettingstarted.md
  133. +1 −1 website/reference/basic/gettingstarted_debian.md
  134. +1 −1 website/reference/basic/gettingstarted_redhat.md
  135. +1 −1 website/reference/basic/messageformat.md
  136. +1 −1 website/reference/integration/activemq_clusters.md
  137. +1 −3 website/reference/plugins/aggregate.md
  138. +129 −0 website/releasenotes.md
View
@@ -2,7 +2,12 @@ source 'https://rubygems.org'
gem 'json'
gem 'stomp'
gem 'systemu'
if RUBY_VERSION =~ /^1.8/
gem 'systemu', '2.6.4'
else
gem 'systemu'
end
group :dev do
gem 'rake'
View
2 README
@@ -3,4 +3,4 @@ The Marionette Collective
The Marionette Collective aka. mcollective is a framework to build server orchestration or parallel job execution systems.
For full information, wikis, ticketing and downloads please see http://marionette-collective.org/
For full information, wikis, ticketing and downloads please see https://puppetlabs.com/mcollective
View
@@ -0,0 +1,3 @@
/log/
/junit/
/.vagrant
View
@@ -0,0 +1,27 @@
# Specifies a gem mirror; duplicated in acceptance setup
# to ensure a similar environment on acceptance hosts.
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
def location_for(place, fake_version = nil)
if place =~ /^(git:[^#]*)#(.*)/
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
elsif place =~ /^file:\/\/(.*)/
['>= 0', { :path => File.expand_path($1), :require => false }]
else
[place, { :require => false }]
end
end
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 2.8')
gem "rake", "~> 10.1"
gem "httparty", :require => false
gem 'uuidtools', :require => false
group(:test) do
gem "rspec", "~> 2.14.0", :require => false
gem "mocha", "~> 0.10.5", :require => false
end
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)
end
View
@@ -0,0 +1,46 @@
beaker tests for validation of MCollective in puppet-agent
# WARNING
![There be Dragons](http://upload.wikimedia.org/wikipedia/commons/thumb/b/bc/Chinese_black_dragon.svg/235px-Chinese_black_dragon.svg.png)
**WARNING:** Under NO circumstances should you use **any** of the
certificate files located in the /acceptance directory or any of
its subdirectories in a production system. The private keys are
publicly available and **will** result in an insecure environment
# Files directory
/files contains pre-generated certificates and configuration files
that are used by the acceptance test pre-suites in order to quickly
facilitate a running environment on the system under test. The
certificates in the /files directory are for testing purposes only
and are publicly available.
These files were generated using the command outlined below, in the
*SSL setup* section.
# SSL setup
/ssl is a puppet master's ssl directory. Selected files from this
have been copied into the files/ directory, either directly as .pem
files, or combined into java truststores.
Commands used to set it up:
puppet master --ssldir=`pwd`/ssl
puppet cert --ssldir=`pwd`/ssl generate activemq
puppet cert --ssldir=`pwd`/ssl generate mcollective-client
puppet cert --ssldir=`pwd`/ssl generate mcollective-server
keytool -storepasswd -storepass notsecret -import -alias 'puppet ca' -file ssl/ca/ca_crt.pem -keystore files/activemq.truststore
cat ssl/private_keys/activemq.pem ssl/certs/activemq.pem > activemq.combined.pem
openssl pkcs12 -password pass:notsecret -export -in activemq.combined.pem -out activemq.p12 -name activemq.example.com
keytool -importkeystore -destkeystore files/activemq.keystore -deststorepass notsecret -srckeystore activemq.p12 -srcstoretype PKCS12 -srcstorepass notsecret -alias activemq.example.com
rm activemq.combined.pem activemq.p12
cp ssl/ca/ca_crt.pem files/ca_crt.pem
cp ssl/certs/mcollective-server.pem files/server.crt
cp ssl/private_keys/mcollective-server.pem files/server.key
cp ssl/certs/mcollective-client.pem files/client.crt
cp ssl/private_keys/mcollective-client.pem files/client.key
Oops, something went wrong.

No commit comments for this range