Use global generated groups in launch-node

When launching a server, ansible needs to know what groups the
new host is in so that it can copy the appropriate files.  Figuring
that out is done based on the groups.txt file and the expand-groups
script.  This change runs that script after creating a host, which
will update the global list of expanded groups.  That is then
symlinked into a temporary inventory directory used by launch-node.

The JobDir concept is borrowed from Zuul as a simple way of creating
and deleting at the appropriate time a complex temporary directory.

Change-Id: Icce083ca67a3473b7d77401142f870fd28dd08f5

launch/launch-node.py

@@ -20,6 +20,7 @@
 
 import argparse
 import os
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -43,6 +44,24 @@ except:
     pass
 
 
+class JobDir(object):
+    def __init__(self, keep=False):
+        self.keep = keep
+        self.root = tempfile.mkdtemp()
+        self.inventory_root = os.path.join(self.root, 'inventory')
+        os.makedirs(self.inventory_root)
+        self.hosts = os.path.join(self.inventory_root, 'hosts')
+        self.groups = os.path.join(self.inventory_root, 'groups')
+        self.key = os.path.join(self.root, 'id_rsa')
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, etype, value, tb):
+        if not self.keep:
+            shutil.rmtree(self.root)
+
+
 def bootstrap_server(server, key, name, volume_device, keep,
                      mount_path, fs_label):
 
@@ -88,40 +107,62 @@ def bootstrap_server(server, key, name, volume_device, keep,
                    'install_puppet.sh')
     ssh_client.ssh('bash -x install_puppet.sh')
 
-    # Write out the private SSH key we generated
+    # Zero the ansible inventory cache so that next run finds the new server
-    key_file = tempfile.NamedTemporaryFile(delete=not keep)
+    inventory_cache = '/var/cache/ansible-inventory/ansible-inventory.cache'
-    key.write_private_key(key_file)
+    if os.path.exists(inventory_cache):
-    key_file.flush()
+        with open(inventory_cache, 'w'):
+            pass
 
-    # Write out inventory
+    # Update the generated-groups file globally and incorporate it
-    inventory_file = tempfile.NamedTemporaryFile(delete=not keep)
+    # into our inventory
-    inventory_file.write("{host} ansible_host={ip} ansible_user=root".format(
+    # Remove cloud and region from the environment to work around a bug in occ
-        host=name, ip=server.interface_ip))
+    expand_env = os.environ.copy()
-    inventory_file.flush()
+    expand_env.pop('OS_CLOUD', None)
+    expand_env.pop('OS_REGION_NAME', None)
 
-    ansible_cmd = [
+    print subprocess.check_output(
-        'ansible-playbook',
+        '/usr/local/bin/expand-groups.sh',
-        '-i', inventory_file.name, '-l', name,
+        env=expand_env,
-        '--private-key={key}'.format(key=key_file.name),
+        stderr=subprocess.STDOUT)
-        "--ssh-common-args='-o StrictHostKeyChecking=no'",
-        '-e', 'target={name}'.format(name=name),
-    ]
 
-    # Run the remote puppet apply playbook limited to just this server
+    with JobDir(keep) as jobdir:
-    # we just created
+        # Write out the private SSH key we generated
-    try:
+        with open(jobdir.key, 'w') as key_file:
-        for playbook in [
+            key.write_private_key(key_file)
-                'set_hostnames.yml',
+        os.chmod(jobdir.key, 0o600)
-                'remote_puppet_adhoc.yaml']:
+
-            print subprocess.check_output(
+        # Write out inventory
-                ansible_cmd + [
+        with open(jobdir.hosts, 'w') as inventory_file:
-                    os.path.join(
+            inventory_file.write(
-                        SCRIPT_DIR, '..', 'playbooks', playbook)],
+                "{host} ansible_host={ip} ansible_user=root".format(
-                stderr=subprocess.STDOUT)
+                    host=name, ip=server.interface_ip))
-    except subprocess.CalledProcessError as e:
+
-        print "Subprocess failed"
+        os.symlink('/etc/ansible/hosts/generated-groups',
-        print e.output
+                   jobdir.groups)
-        raise
+
+        ansible_cmd = [
+            'ansible-playbook',
+            '-i', jobdir.inventory_root, '-l', name,
+            '--private-key={key}'.format(key=jobdir.key),
+            "--ssh-common-args='-o StrictHostKeyChecking=no'",
+            '-e', 'target={name}'.format(name=name),
+        ]
+
+        # Run the remote puppet apply playbook limited to just this server
+        # we just created
+        try:
+            for playbook in [
+                    'set_hostnames.yml',
+                    'remote_puppet_adhoc.yaml']:
+                print subprocess.check_output(
+                    ansible_cmd + [
+                        os.path.join(
+                            SCRIPT_DIR, '..', 'playbooks', playbook)],
+                    stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as e:
+            print "Subprocess failed"
+            print e.output
+            raise
 
     try:
         ssh_client.ssh("reboot")
@@ -275,20 +316,5 @@ def main():
                           options.availability_zone)
     dns.print_dns(cloud, server)
 
-    # Zero the ansible inventory cache so that next run finds the new server
-    inventory_cache = '/var/cache/ansible-inventory/ansible-inventory.cache'
-    if os.path.exists(inventory_cache):
-        with open(inventory_cache, 'w'):
-            pass
-    # Remove cloud and region from the environment to work around a bug in occ
-    expand_env = os.environ.copy()
-    expand_env.pop('OS_CLOUD', None)
-    expand_env.pop('OS_REGION_NAME', None)
-
-    print subprocess.check_output(
-        '/usr/local/bin/expand-groups.sh',
-        env=expand_env,
-        stderr=subprocess.STDOUT)
-
 if __name__ == '__main__':
     main()