salt/conf
Stephen D. Spencer f6dbeaf0e4 replace bad value for master_type in example minion config
At some point, `standard` became an invalid argument for the master_type
minion config bit.  The bootstrap script, perhaps naively, uses this
file to lay down a minion config for a newly bootstrapped system.

bootstrap.sh should probably just drop an empty /etc/salt/minion rather
than trying to set every available minion opt.

In lieu of wading into bootstrap*, this allows Minion.eval_master() to
not soil itself and continue on its merry way when not operating in one
of its more advanced contexts.

* mad props to the creators/maintainers of the bootstrap script.  BASH makes
  me want to cut myself, so I appreciate complex scripts that are so
  very functional that I don't have to be responsible for
2015-06-30 13:50:41 -05:00
..
cloud.maps.d Fixing up salt-cloud sample configs 2013-11-20 08:48:01 -07:00
cloud.profiles.d Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
cloud.providers.d Add more URL clarifications 2014-08-07 16:25:14 -06:00
cloud clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
cloud.profiles Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
cloud.providers Chmod files back to original 2014-03-22 17:47:54 +01:00
master Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-16 15:13:53 -06:00
minion replace bad value for master_type in example minion config 2015-06-30 13:50:41 -05:00
roster Added default config for salt-ssh 2013-10-01 23:54:51 +10:00