From 6b9a27a90fe6c504a54947d36ed994f241174744 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 15 Sep 2014 18:20:24 +0000 Subject: [PATCH] Use the current Puppet master when launching Change-Id: Ia5f5320aa77791c6c03b42b395945132e699f57e --- launch/README | 4 ++-- launch/launch-node.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launch/README b/launch/README index 7f1283cdba..955db745e4 100644 --- a/launch/README +++ b/launch/README @@ -45,8 +45,8 @@ exported a relevant FQDN and sourced the appropriate API credentials above. When running outside the official OpenStack CI infrastructure, you -will want to pass --server ci-puppetmaster.example.com otherwise the -new node wil try to register with ci-puppetmaster.openstack.org - and +will want to pass --server puppetmaster.example.com otherwise the +new node wil try to register with puppetmaster.openstack.org - and fail hilariously. Add DNS Records diff --git a/launch/launch-node.py b/launch/launch-node.py index ed7cda3d40..a750be323b 100755 --- a/launch/launch-node.py +++ b/launch/launch-node.py @@ -195,7 +195,7 @@ def main(): help="name of signed puppet certificate file (e.g., " "hostname.example.com.pem)") parser.add_argument("--server", dest="server", help="Puppetmaster to use.", - default="ci-puppetmaster.openstack.org") + default="puppetmaster.openstack.org") parser.add_argument("--volume", dest="volume", help="UUID of volume to attach to the new server.", default=None)