From 6585339b5619c57613e29790a7fa1f3f0389b903 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 15 Sep 2014 18:17:19 +0000
Subject: [PATCH] Update config documentation to refer to new master
Change-Id: I9072e866e47587d2de7e6d3c8f1e264d91a0d389
---
doc/source/puppet.rst | 4 ++--
doc/source/running-your-own.rst | 6 +++---
doc/source/sysadmin.rst | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst
index c367a69338..e0cbfb2822 100644
--- a/doc/source/puppet.rst
+++ b/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:
diff --git a/doc/source/running-your-own.rst b/doc/source/running-your-own.rst
index 72c0ff8ede..ac4e6e33b8 100644
--- a/doc/source/running-your-own.rst
+++ b/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.
diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index 4798adb89e..7ce18fbe4f 100644
--- a/doc/source/sysadmin.rst
+++ b/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