Merge "Update config documentation to refer to new master"

doc/source/puppet.rst

@@ -14,7 +14,7 @@ At a Glance
 ===========
 
 :Hosts:
-  * ci-puppetmaster.openstack.org
+  * puppetmaster.openstack.org
 :Puppet:
   * :file:`modules/openstack_project/manifests/puppetmaster.pp`
 :Projects:
@@ -90,7 +90,7 @@ hostname of the puppet master with the following additions to
 .. code-block:: ini
 
    [main]
-   server=ci-puppetmaster.openstack.org
+   server=puppetmaster.openstack.org
    certname=review.openstack.org
 
 The cert signing process needs to be started with:

doc/source/running-your-own.rst

@@ -50,7 +50,7 @@ site.pp
 ~~~~~~~
 
 This file lists the specific servers you are running. Minimally you need a
-ci-puppetmaster, gerrit (review), jenkins (secure jobs such as making
+puppetmaster, gerrit (review), jenkins (secure jobs such as making
 releases), jenkins01 (untrusted jobs from any code author), puppetboard,
 nodepool, zuul, and then one or more slaves with appropriate distro choices.
 
@@ -92,7 +92,7 @@ The minimum set of things to port across is:
 
 * The default node definition in site.pp
 
-* The ci-puppetmaster definition in site.pp
+* The puppetmaster definition in site.pp
 
 * The puppetdb definition in site.pp
 
@@ -120,7 +120,7 @@ for full details)::
     . /root/ci-launch/
     export FQDN=servername.project.example.com
     puppet cert generate $FQDN
-    ./launch-node.py $FQDN --server ci-puppetmaster.project.example.com
+    ./launch-node.py $FQDN --server puppetmaster.project.example.com
 
 * This will chug for a while.
 

doc/source/sysadmin.rst

@@ -285,7 +285,7 @@ Adding a New Device
 If the main volume group doesn't have enough space for what you want
 to do, this is how you can add a new volume.
 
-Log into ci-puppetmaster.openstack.org and run::
+Log into puppetmaster.openstack.org and run::
 
   . ~root/cinder-venv/bin/activate
   . ~root/ci-launch/cinder.sh