opendev/system-config
Code Issues Proposed changes

Merge "launch: add puppet environment option"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 01:21:15 +00:00 committed by Gerrit Code Review
commit 44f909dc7c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
launch/launch-node.py
View File

@ -94,7 +94,7 @@ def stream_syslog(ssh_client):
def bootstrap_server(server, key, name, volume_device, keep, def bootstrap_server(server, key, name, volume_device, keep,
mount_path, fs_label): mount_path, fs_label, environment):
ip = server.public_v4 ip = server.public_v4
ssh_kwargs = dict(pkey=key) ssh_kwargs = dict(pkey=key)
@ -199,6 +199,10 @@ def bootstrap_server(server, key, name, volume_device, keep,
'-e', 'target={name}'.format(name=name), '-e', 'target={name}'.format(name=name),
] ]
if environment is not None:
ansible_cmd += [
'-e',
'puppet_environment={env}'.format(env=environment)]
# Run the remote puppet apply playbook limited to just this server # Run the remote puppet apply playbook limited to just this server
# we just created # we just created
for playbook in [ for playbook in [
@ -221,7 +225,7 @@ def bootstrap_server(server, key, name, volume_device, keep,
def build_server(cloud, name, image, flavor, def build_server(cloud, name, image, flavor,
volume, keep, network, boot_from_volume, config_drive, volume, keep, network, boot_from_volume, config_drive,
mount_path, fs_label, availability_zone): mount_path, fs_label, availability_zone, environment):
key = None key = None
server = None server = None
@ -264,7 +268,7 @@ def build_server(cloud, name, image, flavor,
else: else:
volume_device = None volume_device = None
bootstrap_server(server, key, name, volume_device, keep, bootstrap_server(server, key, name, volume_device, keep,
mount_path, fs_label) mount_path, fs_label, environment)
print('UUID=%s\nIPV4=%s\nIPV6=%s\n' % ( print('UUID=%s\nIPV4=%s\nIPV6=%s\n' % (
server.id, server.public_v4, server.public_v6)) server.id, server.public_v4, server.public_v6))
except Exception: except Exception:
@ -306,6 +310,9 @@ def main():
parser.add_argument("--image", dest="image", parser.add_argument("--image", dest="image",
default="Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)", default="Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
help="image name") help="image name")
parser.add_argument("--environment", dest="environment",
help="Puppet environment to use",
default=None)
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)
@ -369,7 +376,8 @@ def main():
options.network, options.boot_from_volume, options.network, options.boot_from_volume,
options.config_drive, options.config_drive,
options.mount_path, options.fs_label, options.mount_path, options.fs_label,
options.availability_zone) options.availability_zone,
options.environment)
dns.print_dns(cloud, server) dns.print_dns(cloud, server)
if __name__ == '__main__': if __name__ == '__main__':