opendev/system-config
Code Issues Proposed changes

Update launch-node script.

Browse Source 
* Update credential paths in launch README.
* Add puppet environment command line option to launch-node.
* Invoke install_puppet.sh from launch-node.

Change-Id: I11a326d4be2274fcecb1a58a32c8962b36af24a8
Reviewed-on: https://review.openstack.org/19000
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-01-04 19:36:37 +00:00 committed by Jenkins
parent d45bddc133
commit 85a97ecd1a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launch/README
View File

@ -5,11 +5,11 @@ root environment::
To launch a node in the OpenStack CI account (production servers):: To launch a node in the OpenStack CI account (production servers)::
. openstackci-rs-nova.sh . ~root/ci-launch/openstackci-rs-nova.sh
To launch a node in the OpenStack Jenkins account (slave nodes):: To launch a node in the OpenStack Jenkins account (slave nodes)::
. openstackjenkins-rs-nova.sh . ~root/ci-launch/openstackjenkins-rs-nova.sh
Then:: Then::
@ -36,8 +36,8 @@ the ''nova list'' command). The environment variables used in the
URL should be satisfied by sourcing the "openstackci-rs-nova.sh" URL should be satisfied by sourcing the "openstackci-rs-nova.sh"
script (or jenkins, as appropriate). script (or jenkins, as appropriate).
. ~/rackdns-venv/bin/activate . ~root/rackdns-venv/bin/activate
. openstackci-rs-nova.sh . ~root/openstackci-rs-nova.sh
export SERVERNAME=server export SERVERNAME=server
nova list | grep "| $SERVERNAME\.openstack\.org " nova list | grep "| $SERVERNAME\.openstack\.org "

27
launch/launch-node.py
View File

@ -34,6 +34,8 @@ NOVA_URL=os.environ['OS_AUTH_URL']
NOVA_PROJECT_ID=os.environ['OS_TENANT_NAME'] NOVA_PROJECT_ID=os.environ['OS_TENANT_NAME']
NOVA_REGION_NAME=os.environ['OS_REGION_NAME'] NOVA_REGION_NAME=os.environ['OS_REGION_NAME']
SCRIPT_DIR = os.path.dirname(sys.argv[0])
def get_client(): def get_client():
args = [NOVA_USERNAME, NOVA_PASSWORD, NOVA_PROJECT_ID, NOVA_URL] args = [NOVA_USERNAME, NOVA_PASSWORD, NOVA_PROJECT_ID, NOVA_URL]
kwargs = {} kwargs = {}
@ -43,7 +45,7 @@ def get_client():
client = Client(*args, **kwargs) client = Client(*args, **kwargs)
return client return client
def bootstrap_server(server, admin_pass, key, cert): def bootstrap_server(server, admin_pass, key, cert, environment):
client = server.manager.api client = server.manager.api
ip = utils.get_public_ip(server) ip = utils.get_public_ip(server)
if not ip: if not ip:
@ -70,14 +72,11 @@ def bootstrap_server(server, admin_pass, key, cert):
ssh_client = utils.ssh_connect(ip, 'root', ssh_kwargs, timeout=600) ssh_client = utils.ssh_connect(ip, 'root', ssh_kwargs, timeout=600)
ssh_client.ssh("apt-get update") ssh_client.scp(os.path.join(SCRIPT_DIR, '..', 'install_puppet.sh'),
ssh_client.ssh("DEBIAN_FRONTEND=noninteractive apt-get --option" 'install_puppet.sh')
" 'Dpkg::Options::=--force-confold'" ssh_client.ssh('bash -x install_puppet.sh')
" --assume-yes upgrade")
ssh_client.ssh("apt-get install -y --force-yes puppet")
certname = cert[:0-len('.pem')] certname = cert[:0-len('.pem')]
ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/certs") ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/certs")
ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/private_keys") ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/private_keys")
ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/public_keys") ssh_client.ssh("mkdir -p /var/lib/puppet/ssl/public_keys")
@ -99,11 +98,12 @@ def bootstrap_server(server, admin_pass, key, cert):
"/var/lib/puppet/ssl/certs/ca.pem") "/var/lib/puppet/ssl/certs/ca.pem")
ssh_client.ssh("puppet agent " ssh_client.ssh("puppet agent "
"--environment %s "
"--server ci-puppetmaster.openstack.org " "--server ci-puppetmaster.openstack.org "
"--no-daemonize --verbose --onetime " "--no-daemonize --verbose --onetime --pluginsync true "
"--certname %s" % certname) "--certname %s" % (environment, certname))
def build_server(client, name, image, flavor, cert): def build_server(client, name, image, flavor, cert, environment):
key = None key = None
server = None server = None
@ -127,7 +127,7 @@ def build_server(client, name, image, flavor, cert):
try: try:
admin_pass = server.adminPass admin_pass = server.adminPass
server = utils.wait_for_resource(server) server = utils.wait_for_resource(server)
bootstrap_server(server, admin_pass, key, cert) bootstrap_server(server, admin_pass, key, cert, environment)
if key: if key:
kp.delete() kp.delete()
except Exception, real_error: except Exception, real_error:
@ -148,6 +148,9 @@ def main():
parser.add_argument("--image", dest="image", parser.add_argument("--image", dest="image",
default="Ubuntu 12.04 LTS (Precise Pangolin)", default="Ubuntu 12.04 LTS (Precise Pangolin)",
help="image name") help="image name")
parser.add_argument("--environment", dest="environment",
default="production",
help="puppet environment name")
parser.add_argument("--cert", dest="cert", required=True, parser.add_argument("--cert", dest="cert", required=True,
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)")
@ -184,7 +187,7 @@ def main():
image = images[0] image = images[0]
print "Found image", image print "Found image", image
build_server(client, options.name, image, flavor, options.cert) build_server(client, options.name, image, flavor, options.cert, options.environment)
if __name__ == '__main__': if __name__ == '__main__':
main() main()