opendev/system-config
Code Issues Proposed changes

Merge "Use the current Puppet master when launching"

Browse Source
This commit is contained in:
Jenkins 2014-09-23 21:28:30 +00:00 committed by Gerrit Code Review
commit 6897d960fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launch/README
View File

@ -45,8 +45,8 @@ exported a relevant FQDN and sourced the appropriate API credentials
above. above.
When running outside the official OpenStack CI infrastructure, you When running outside the official OpenStack CI infrastructure, you
will want to pass --server ci-puppetmaster.example.com otherwise the will want to pass --server puppetmaster.example.com otherwise the
new node wil try to register with ci-puppetmaster.openstack.org - and new node wil try to register with puppetmaster.openstack.org - and
fail hilariously. fail hilariously.
Add DNS Records Add DNS Records

2
launch/launch-node.py
View File

@ -195,7 +195,7 @@ def main():
help="name of signed puppet certificate file (e.g., " help="name of signed puppet certificate file (e.g., "
"hostname.example.com.pem)") "hostname.example.com.pem)")
parser.add_argument("--server", dest="server", help="Puppetmaster to use.", 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", parser.add_argument("--volume", dest="volume",
help="UUID of volume to attach to the new server.", help="UUID of volume to attach to the new server.",
default=None) default=None)