From 6aa046e866c4516b83b9a304f54c041d0ad068c8 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Mon, 16 Feb 2015 08:38:23 -0800 Subject: [PATCH] Update docs for puppet 3 Change-Id: I23049a65e5470805ea494f50e58ae586d4fce710 --- doc/source/puppet.rst | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst index 3676c556f8..8a1da7971f 100644 --- a/doc/source/puppet.rst +++ b/doc/source/puppet.rst @@ -21,9 +21,9 @@ At a Glance * https://puppetlabs.com/ :Bugs: * https://storyboard.openstack.org/#!/project/748 - * http://projects.puppetlabs.com/ + * https://tickets.puppetlabs.com/ :Resources: - * `Puppet Language Reference `_ + * `Puppet Language Reference `_ Puppet Master ------------- @@ -34,15 +34,12 @@ ship the data to the clients. The cron jobs, current configuration files and more can be done with ``puppet apply`` but first some bootstrapping needs to be done. -First want to install these from puppetlabs' apt repo. We have not yet migrated -to puppet 3, so we pin puppet to 2.x. There is a script in the root of the -system-config repository that will setup appropriate pinning and install the -puppet client. After that installing the puppetmaster and hiera (used to +You want to install these from puppetlabs' apt repo. There is a script in the +root of the system-config repository that will setup and install the +puppet client. After that you must install the puppetmaster and hiera (used to maintain secrets on the puppet master). -Please note: Fedora F19 and Ubuntu Raring and above cannot successfully run an -OpenStack-CI puppetmaster due to new Ruby and older Puppet not being -compatible, so be sure to use an older release - e.g. Ubuntu Precise. +Puppet 3 masters can run on Trusty, Precise, and Centos 6. .. code-block:: bash