From 3ac0a5eb69f1c7e7f5cf39995d4186e558531dde Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 23 May 2016 19:42:18 +0000 Subject: [PATCH] Use an ordinal server naming pattern As discussed during the "Launch Node, Ansible and Puppet" summit session in Austin, we're making things unnecessarily hard on ourselves by insisting on having multiple servers in our inventory with the same name. In order to make server addition and replacement automation simpler, start using an ordinal suffix on server short names to differentiate them (we can still easily rely on DNS for their non-numbered convenience names). Change-Id: I040a5c3b5e1abc50c3e4676bcab0bf4eaa550f4b --- doc/source/sysadmin.rst | 7 +++++-- launch/README | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst index 80f33f9386..2bac43cd29 100644 --- a/doc/source/sysadmin.rst +++ b/doc/source/sysadmin.rst @@ -120,8 +120,11 @@ To create a new server, do the following: * Add a file in :file:`modules/openstack_project/manifests/` that defines a class which specifies the configuration of the server. - * Add a node entry in :file:`manifests/site.pp` for the server that uses that - class. + * Add a node pattern entry in :file:`manifests/site.pp` for the server + that uses that class. Make sure it supports an ordinal naming pattern + (e.g., fooserver01.openstack.org not just fooserver.openstack.org, even + if you're replacing an existing server) and that another server with the + same does not already exist in the ansible inventory. * If your server needs private information such as passwords, use hiera calls in the site manifest, and ask an infra-core team member diff --git a/launch/README b/launch/README index f67fcba467..b8e049b8a3 100644 --- a/launch/README +++ b/launch/README @@ -17,7 +17,7 @@ To launch a node in the OpenStack CI account (production servers):: export OS_CLOUD=openstackci-rax export OS_REGION=DFW export FLAVOR="8 GB Performance" - export FQDN=servername.openstack.org + export FQDN=servername01.openstack.org cd /opt/system-config/production/launch/ ./launch-node.py $FQDN --flavor "$FLAVOR" \ --cloud=$OS_CLOUD --region=$OS_REGION @@ -26,7 +26,7 @@ To launch a node in the OpenStack Jenkins account (slave nodes):: export OS_CLOUD=openstackjenkins-rax export OS_REGION=DFW - export FQDN=slavename.slave.openstack.org + export FQDN=slavename01.slave.openstack.org openstack image list export IMAGE='Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' openstack flavor list