Merge lp:~gandelman-a/charms/precise/keystone/openstack-charmers-merge into lp:~openstack-charmers/charms/precise/keystone/ha-support

[Adam Gandelman]

This redirects a merge into the upstream charm toward the ~openstack-charmers WIP branches. Most the changes enable better grizzly support, the other changes are mostly openstack_common.py sync and a general rebase against upstream charm.

Original MP @ https://code.launchpad.net/~gandelman-a/charms/precise/keystone/grizzly/+merge/142429

=== modified file 'config.yaml'
--- config.yaml	2012-12-17 17:02:04 +0000
+++ config.yaml	2013-01-18 00:33:20 +0000
@@ -26,6 +26,10 @@
     default: "/etc/keystone/keystone.conf"
     type: string
     description: "Location of keystone configuration file"
+  log-level:
+    default: WARNING
+    type: string
+    description: Log level (WARNING, INFO, DEBUG, ERROR)
   service-port:
     default: 5000
     type: int
@@ -99,3 +103,8 @@
     description: |
       Default multicast port number that will be used to communicate between
       HA Cluster nodes.
+  # PKI enablement and configuration (Grizzly and beyond)
+  enable-pki:
+    default: "false"
+    type: string
+    description: "Enable PKI token signing (Grizzly and beyond)"

=== modified file 'hooks/keystone-hooks'
--- hooks/keystone-hooks	2013-01-07 12:37:48 +0000
+++ hooks/keystone-hooks	2013-01-18 00:33:20 +0000
@@ -40,7 +40,7 @@
         "desc": "S3 Compatible object-store"
     },
     "swift": {
-        "type": "storage",
+        "type": "object-store",
         "desc": "Swift Object Storage Service"
     },
     "quantum": {
@@ -140,6 +140,14 @@
     settings = relation_get_dict(relation_id=relation_id,
                                  remote_unit=remote_unit)
 
+    # Allow the remote service to request creation of any additional roles.
+    # Currently used by Swift.
+    if 'requested_roles' in settings and settings['requested_roles'] != 'None':
+        roles = settings['requested_roles'].split(',')
+        juju_log("Creating requested roles: %s" % roles)
+        for role in roles:
+            create_role(role, user=config['admin-user'], tenant='admin')
+
     # the minimum settings needed per endpoint
     single = set(['service', 'region', 'public_url', 'admin_url',
                   'internal_url'])
@@ -250,7 +258,8 @@
     available = get_os_codename_install_source(config['openstack-origin'])
     installed = get_os_codename_package('keystone')
 
-    if get_os_version_codename(available) > get_os_version_codename(installed):
+    if (available and
+        get_os_version_codename(available) > get_os_version_codename(installed)):
         do_openstack_upgrade(config['openstack-origin'], packages)
 
     set_admin_token(config['admin-token'])
@@ -261,6 +270,13 @@
     elif not is_clustered():
         ensure_initial_admin(config)
 
+    update_config_block('logger_root', level=config['log-level'],
+                        file='/etc/keystone/logging.conf')
+    if get_os_version_package('keystone') >= '2013.1':
+        # PKI introduced in Grizzly
+        configure_pki_tokens(config)
+
+    execute("service keystone restart", echo=True)
     cluster_changed()
 
 

=== modified file 'hooks/lib/openstack_common.py'
--- hooks/lib/openstack_common.py	2013-01-07 12:37:48 +0000
+++ hooks/lib/openstack_common.py	2013-01-18 00:33:20 +0000
@@ -23,6 +23,12 @@
     '2013.1': 'grizzly'
 }
 
+# The ugly duckling
+swift_codenames = {
+    '1.4.3': 'diablo',
+    '1.4.8': 'essex',
+    '1.7.4': 'folsom'
+}
 
 def juju_log(msg):
     subprocess.check_call(['juju-log', msg])
@@ -119,12 +125,32 @@
 
     vers = vers[:6]
     try:
-        return openstack_codenames[vers]
+        if 'swift' in pkg:
+            vers = vers[:5]
+            return swift_codenames[vers]
+        else:
+            vers = vers[:6]
+            return openstack_codenames[vers]
     except KeyError:
         e = 'Could not determine OpenStack codename for version %s' % vers
         error_out(e)
 
 
+def get_os_version_package(pkg):
+    '''Derive OpenStack version number from an installed package.'''
+    codename = get_os_codename_package(pkg)
+
+    if 'swift' in pkg:
+        vers_map = swift_codenames
+    else:
+        vers_map = openstack_codenames
+
+    for version, cname in vers_map.iteritems():
+        if cname == codename:
+            return version
+    e = "Could not determine OpenStack version for package: %s" % pkg
+    error_out(e)
+
 def configure_installation_source(rel):
     '''Configure apt installation source.'''
 
@@ -165,9 +191,11 @@
                 'version (%s)' % (ca_rel, ubuntu_rel)
             error_out(e)
 
-        if ca_rel == 'folsom/staging':
+        if 'staging' in ca_rel:
             # staging is just a regular PPA.
-            cmd = 'add-apt-repository -y ppa:ubuntu-cloud-archive/folsom-staging'
+            os_rel = ca_rel.split('/')[0]
+            ppa = 'ppa:ubuntu-cloud-archive/%s-staging' % os_rel
+            cmd = 'add-apt-repository -y %s' % ppa
             subprocess.check_call(cmd.split(' '))
             return
 
@@ -175,7 +203,10 @@
         pockets = {
             'folsom': 'precise-updates/folsom',
             'folsom/updates': 'precise-updates/folsom',
-            'folsom/proposed': 'precise-proposed/folsom'
+            'folsom/proposed': 'precise-proposed/folsom',
+            'grizzly': 'precise-updates/grizzly',
+            'grizzly/updates': 'precise-updates/grizzly',
+            'grizzly/proposed': 'precise-proposed/grizzly'
         }
 
         try:
@@ -192,11 +223,9 @@
     else:
         error_out("Invalid openstack-release specified: %s" % rel)
 
-
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
 HAPROXY_DEFAULT = '/etc/default/haproxy'
 
-
 def configure_haproxy(units, service_ports, template_dir=None):
     template_dir = template_dir or 'templates'
     import jinja2

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2012-12-18 13:46:21 +0000
+++ hooks/utils.py	2013-01-18 00:33:20 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import ConfigParser
 import subprocess
 import sys
 import json
@@ -164,106 +165,26 @@
                           keystone_conf)
     error_out('Could not find admin_token line in %s' % keystone_conf)
 
-def update_config_block(block, **kwargs):
+def update_config_block(section, **kwargs):
     """ Updates keystone.conf blocks given kwargs.
-    Can be used to update driver settings for a particular backend,
-    setting the sql connection, etc.
-
-    Parses block heading as '[block]'
-
-    If block does not exist, a new block will be created at end of file with
-    given kwargs
-    """
-    f = open(keystone_conf, "r+")
-    orig = f.readlines()
-    new = []
-    found_block = ""
-    heading = "[%s]\n" % block
-
-    lines = len(orig)
-    ln = 0
-
-    def update_block(block):
-        for k, v in kwargs.iteritems():
-            for l in block:
-                if l.strip().split(" ")[0] == k:
-                    block[block.index(l)] = "%s = %s\n" % (k, v)
-                    return
-            block.append('%s = %s\n' % (k, v))
-            block.append('\n')
-
-    try:
-        found = False
-        while ln < lines:
-            if orig[ln] != heading:
-                new.append(orig[ln])
-                ln += 1
-            else:
-                new.append(orig[ln])
-                ln += 1
-                block = []
-                while orig[ln].strip() != '':
-                    block.append(orig[ln])
-                    ln += 1
-                update_block(block)
-                new += block
-                found = True
-
-        if not found:
-            if new[(len(new) - 1)].strip() != '':
-                new.append('\n')
-            new.append('%s' % heading)
-            for k, v in kwargs.iteritems():
-                new.append('%s = %s\n' % (k, v))
-            new.append('\n')
-    except:
-        error_out('Error while attempting to update config block. '\
-                  'Refusing to overwite existing config.')
-
-        return
-
-    # backup original config
-    backup = open(keystone_conf + '.juju-back', 'w+')
-    for l in orig:
-        backup.write(l)
-    backup.close()
-
-    # update config
-    f.seek(0)
-    f.truncate()
-    for l in new:
-        f.write(l)
-
-
-def keystone_conf_update(opt, val):
-    """ Updates keystone.conf values 
-    If option exists, it is reset to new value
-    If it does not, it added to the top of the config file after the [DEFAULT]
-    heading to keep it out of the paste deploy config
-    """
-    f = open(keystone_conf, "r+")
-    orig = f.readlines()
-    new = ""
-    found = False
-    for l in orig:
-        if l.split(' ')[0] == opt:
-            juju_log("Updating %s, setting %s = %s" % (keystone_conf, opt, val))
-            new += "%s = %s\n" % (opt, val)
-            found  = True
-        else:
-            new += l
-    new = new.split('\n')
-    # insert a new value at the top of the file, after the 'DEFAULT' header so
-    # as not to muck up paste deploy configuration later in the file 
-    if not found:
-        juju_log("Adding new config option %s = %s" % (opt, val))
-        header = new.index("[DEFAULT]")
-        new.insert((header+1), "%s = %s" % (opt, val))
-    f.seek(0)
-    f.truncate()
-    for l in new:
-        f.write("%s\n" % l)
-    f.close
+    Update a config setting in a specific setting of a config
+    file (/etc/keystone/keystone.conf, by default)
+    """
+    if 'file' in kwargs:
+        conf_file = kwargs['file']
+        del kwargs['file']
+    else:
+        conf_file = keystone_conf
+    config = ConfigParser.RawConfigParser()
+    config.read(conf_file)
+
+    if section != 'DEFAULT' and not config.has_section(section):
+        config.add_section(section)
+
+    for k, v in kwargs.iteritems():
+        config.set(section, k, v)
+    with open(conf_file, 'wb') as out:
+        config.write(out)
 
 def create_service_entry(service_name, service_type, service_desc, owner=None):
     """ Add a new service entry to keystone if one does not already exist """
@@ -339,11 +260,11 @@
                                  password=password,
                                  email='juju@localhost',
                                  tenant_id=tenant_id)
-        juju_log("Created new user '%s' pw: %s tenant: %s" % (name, password, tenant_id))
+        juju_log("Created new user '%s' tenant: %s" % (name, tenant_id))
         return
     juju_log("A user named '%s' already exists" % name)
 
-def create_role(name, user, tenant):
+def create_role(name, user=None, tenant=None):
     """ creates a role if it doesn't already exist. grants role to user """
     import manager
     manager = manager.KeystoneManager(endpoint='http://localhost:35357/v2.0/',
@@ -355,6 +276,9 @@
     else:
         juju_log("A role named '%s' already exists" % name)
 
+    if not user and not tenant:
+        return
+
     # NOTE(adam_g): Keystone client requires id's for add_user_role, not names
     user_id = manager.resolve_user_id(user)
     role_id = manager.resolve_role_id(name)
@@ -471,6 +395,15 @@
     juju_log("Successfully updated password for user '%s'" % username)
 
 
+def configure_pki_tokens(config):
+    '''Configure PKI token signing, if enabled.'''
+    if config['enable-pki'] not in ['True', 'true']:
+        update_config_block('signing', token_format='UUID')
+    else:
+        juju_log('TODO: PKI Support, setting to UUID for now.')
+        update_config_block('signing', token_format='UUID')
+
+
 def do_openstack_upgrade(install_src, packages):
     '''Upgrade packages from a given install src.'''
 

=== modified file 'revision'
--- revision	2013-01-07 12:37:48 +0000
+++ revision	2013-01-18 00:33:20 +0000
@@ -1,1 +1,1 @@
-190
+191