Merge lp:~vila/awsome/deploy-config into lp:awsome

[Vincent Ladeuil]

Based on lp:~vila/awsome/config-with-tests to ease review, this deploy the
config introduced in the pre-requisite.

This simplify the awsome script itself and is a step towards more tests at
lower levels (again, by allowing our objects to be defined via a config
object rather than from env variables).

This proposal registers all known options. Names were chosen mostly to align
with which backend is used and attempting to clarify which auth scheme use
which options.

I've also tried to update the various docs to reflect the changes.

Roughly, with Martin changing the auth scheme used to talk to the hp cloud,
we now have 3 auth schemes:

- passtrough, using the credentials from the requests (must be set
  explicitly),

- userpass, using user/password/tenant_id the 'regular' openstack/keystone
  essex auth scheme,

- legacy, using user/api_key which were used for openstack diablo.

This has been tested against devstack for 'passthrough' and (thanks Martin)
against the HP cloud for 'userpass'.

I don't currently have (nor know) a way to smoke test the 'legacy' one.

[Martin Packman (gz)]

+# is achived and renders this trickuseless. -- vila 20120511

"achieved", "trick useless".

+ # FIXME: s/AwsomeProxyFactory/AWSProxyFactory/ ? -- vila 20120511

EC2ProxyFactory would probably make most sense, we'd want a different class for S3.

+ Option('aws_access_key', default_from_env=['EC2_ACCESS_KEY'],

Per current txaws code, want to then fallback to AWS_ACCESS_KEY_ID, which I'm very impressed you've accomodated by passing a list.

+ Option('aws_secret_key', default_from_env=['EC2_SECRET_KEY'],

Likewise, AWS_SECRET_ACCESS_KEY afterwards.

+ self.address + "v2.0/ec2tokens",

Really, we should expect the 'v2.0/' to be part of NOVA_URL.

+_unitialized_attr = object()
+"""A sentinel needed to act as a default value in a method signature."""

Previous mp already had one of these, don't need two.

review: Approve

[Vincent Ladeuil (vila)]

>>>>> Martin Packman <email address hidden> writes:

    > Review: Approve
    > +# is achived and renders this trickuseless. -- vila 20120511

    > "achieved", "trick useless".

    > + # FIXME: s/AwsomeProxyFactory/AWSProxyFactory/ ? -- vila 20120511

    > EC2ProxyFactory would probably make most sense, we'd want a
    > different class for S3.

Right, too early to decide whether we'll need one or two factories
there but the factory is created before receiving any request so I think
we'll end up with AWS anyway.

As a side note, I'd like to better separate how proxy factories and
channel factories are designed/tested so we can more precisely track
which auth scheme requires which config option/env var. Looking at the
code, it seems proxy factory classes are needed only because they
control how to build channel factories. Building the channel factories
From the config instead will simplify the proxy factories which won't
need to subclass AwsFactory anymore (allowing another simplification in
the script and make the design and the tests clearer (but I digress ;)).

    > + Option('aws_access_key', default_from_env=['EC2_ACCESS_KEY'],

    > Per current txaws code, want to then fallback to
    > AWS_ACCESS_KEY_ID, which I'm very impressed you've accomodated by
    > passing a list.

See my comment in lp:~vila/awsome/config-with-tests, about relying on
env vars.

I don't think adding AWS_ACCESS_KEY_ID makes sense here:

1) I'm not aware of contexts where this is set,

2) This would reinforce relying on env vars,

3) This would reinforce relying on credentials being defined before the
   auth scheme is known (see FIXME in bin/awsome script and comment in
   the other mp).

Overall, we need more tests and we should fix this when adding them.

    > + Option('aws_secret_key', default_from_env=['EC2_SECRET_KEY'],

    > Likewise, AWS_SECRET_ACCESS_KEY afterwards.

    > + self.address + "v2.0/ec2tokens",

    > Really, we should expect the 'v2.0/' to be part of NOVA_URL.

For consistency, right, fixed.

    > +_unitialized_attr = object()
    > +"""A sentinel needed to act as a default value in a method signature."""

    > Previous mp already had one of these, don't need two.

Killed.

Fixes pushed.

=== modified file 'README'
--- README	2012-04-13 16:27:52 +0000
+++ README	2012-05-15 11:34:38 +0000
@@ -11,7 +11,7 @@
 Currently translation support is limited to a small selection of EC2 related
 calls. Several optional parameters like filters that have no clear OpenStack
 equivalent have yet to be implemented. Some IDs and other details exposed to
-clients will be differ when the proxy is doing translation.
+clients will be different when the proxy is doing translation.
 
 When running awsome it needs the user details present in the environment.
 This means for testing currently you want to run it locally, with the details
@@ -27,10 +27,10 @@
 
 <https://aws-portal.amazon.com/gp/aws/developer/account/index.html>
 
-Set EC2_URL to the https url of the region you want to use.
+Set --aws_url to the https url of the region you want to use.
 
-Set EC2_ACCESS_KEY and EC2_SECRET_KEY from the values given as 'Access Key ID'
-and 'Secret Access Key' respectively.
+Set --aws_access_key and --aws_secret_key from the values given as 'Access
+Key ID' and 'Secret Access Key' respectively.
 
 
 HP Cloud
@@ -42,15 +42,14 @@
 
 <https://manage.hpcloud.com/account/api_keys>
 
-When running using the AWS backend, set EC2_URL to the second 'Cloud' url,
-which ends </services/Cloud>.
-
-With the OpenStack Identity Service backend, set NOVA_URL to the 'Identity'
-url, NOVA_PROJECT_ID to 'Tenant ID', and NOVA_API_KEY to 'Access Key ID'.
-
-Both backends need EC2_SECRET_KEY set to 'Secret Key', and EC2_ACCESS_KEY to
-the value of 'Tenant ID' then a colon, then the value of 'Access Key ID'.
-
+When running using the AWS backend, set --aws_url to the second 'Cloud' url,
+which ends </services/Cloud>, set --aws_access_key to the value of 'Tenant
+ID' then a colon, then the value of 'Access Key ID' and set --aws_secret_key
+to 'Secret Key'.
+
+With the OpenStack Identity Service backend, set --os_auth_url to the
+'Identity' url, --os_auth_scheme to 'userpass' --os_tenant_id to 'Tenant
+ID', --os_user and --os_password to the corresponding given values.
 
 Example
 -------

=== modified file 'awsome.conf.example'
--- awsome.conf.example	2012-05-10 07:33:01 +0000
+++ awsome.conf.example	2012-05-15 11:34:38 +0000
@@ -1,7 +1,9 @@
 ## Configuration for Any Web Service Over Me (awsome)
-[DEFAULT]
-
-## File to log to. Defaults to /var/log/awsome.log
+
+# awsome -h will display all possible options.
+[awsome]
+
+## File to log to.
 # log_file = /var/log/awsome.log
 
 ## Backend to use.
@@ -9,22 +11,38 @@
 # backend = openstack
 
 ## Configuration for the AWS backend
-# [aws]
-# ec2_url = http://ec2.amazonaws.com/
 
+# aws_url = http://ec2.amazonaws.com/
 ## Set ec2_access_key and ec2_secret_key from the values given as
 ## 'Access Key ID' and 'Secret Access Key' respectively.
-# ec2_access_key = 
-# ec2_secret_key = 
+# aws_access_key = 
+# aws_secret_key =
 
 ## Configuration for the OpenStack backend
-# [openstack]
-## OpenStack Authentication scheme to use. Possible values: 1, 2, 3 AWSOME
-## will attempt to autodetect it if not specified (FIXME: '3' is for
-## keystone and cannot be autodetected -- vila 20120509).
-# auth_version = 
-## Where requests should be sent (this should be the keystone url for
-## auth_version 3, all service urls are acquired when authenticating)
-## auth_version 1 and 2, this is the openstak nova url (AKA NOVA_URL in most
-## rc files)
-# nova_url =
+## The 'os_' prefix stands for openstack
+
+## Openstack requires a token for all requests, depending on the version and
+## configuration, there are different ways to obtain this token.
+
+## OpenStack URL used for authentication
+# os_auth_url = 
+
+## There are currently several different authentication schemes that are
+## supported:
+
+## The access key and signature from the request itself are used to
+## authenticate, no additional credentials are needed.
+# os_auth_scheme = passthrough
+
+## The user, password and tenant id are used as credentials.
+# os_auth_scheme = userpass
+# os_user =
+# os_password =
+# os_tenant_id = 
+
+## Otherwise, 'os_user' and 'os_api_key' should be specified and are used as
+## credentials. This is the legacy authentication scheme and is expected to
+## be deprecated in the future. The url ends with 'v1.0' or 'v1.1'.
+# os_auth_scheme = legacy
+# os_user =
+# os_api_key =

=== modified file 'awsome/__init__.py'
--- awsome/__init__.py	2012-05-09 07:32:03 +0000
+++ awsome/__init__.py	2012-05-15 11:34:38 +0000
@@ -50,13 +50,6 @@
 # Default request time to live (in seconds)
 AWS_REQUEST_DEFAULT_TTL = 15 * 60
 
-# Default path to log file, if not specified in the configuration or
-# on the command-line.
-DEFAULT_LOG_PATH = "/var/log/awsome.log"
-
-# Default path to config file, unless overridden on the command-line.
-DEFAULT_CONFIG_PATH = '/etc/awsome.conf'
-
 
 def get_single_arg(args, name):
     """Get a single argument from a dictionary mapping names to lists.

=== modified file 'awsome/config.py'
--- awsome/config.py	2012-05-15 11:34:38 +0000
+++ awsome/config.py	2012-05-15 11:34:38 +0000
@@ -202,6 +202,7 @@
             if v is not None:
                 # Option values are always strings
                 self.set(k, v)
+        return parser, args
 
 
 # Predefined converters to get proper values from strings
@@ -254,9 +255,15 @@
 
 option_registry = OptionRegistry()
 
+# Registered options
+
+# FIXME: Some default values are acquired from the environment. This makes
+# sense to ease manual testing but would be removed when enough test coverage
+# is achived and renders this trickuseless. -- vila 20120511
+
 # Not strictly speaking a config option as it makes no sense to set the config
 # file *inside* a config file but this helps support the command line use case
-# and provide a default value
+# and provide a default value.
 option_registry.register(
     Option('config', default='/etc/awsome.conf',
            help='''Configuration file path.'''))
@@ -270,3 +277,75 @@
 option_registry.register(
     Option('log_file', default='/var/log/awsome.log',
            help='''Path to log file.'''))
+
+
+# Backend options
+
+def backend_factory_from_string(string):
+    from awsome import (
+        proxy_aws,
+        proxy_openstack,
+        )
+    # FIXME: s/AwsomeProxyFactory/AWSProxyFactory/ ? -- vila 20120511
+    backends = dict(aws=proxy_aws.AwsomeProxyFactory,
+                    openstack=proxy_openstack.OpenStackProxyFactory)
+    factory = None
+    try:
+        factory = backends[string]
+    except KeyError:
+        pass
+    return factory
+
+
+option_registry.register(
+    Option('backend', default='aws', convert=backend_factory_from_string,
+           help='''Backend to use.'''))
+
+# AWS backend options
+
+option_registry.register(
+    Option('aws_url', default_from_env=['EC2_URL'],
+           help='''AWS URL for the backend.'''))
+option_registry.register(
+    Option('aws_access_key', default_from_env=['EC2_ACCESS_KEY'],
+           help='''AWS access key for the backend.'''))
+option_registry.register(
+    Option('aws_secret_key', default_from_env=['EC2_SECRET_KEY'],
+           help='''AWS secret key for the backend.'''))
+
+
+# Openstack backend options
+
+option_registry.register(
+    Option('os_auth_url', default_from_env=['NOVA_URL'],
+           help='''OpenStack authentication URL.'''))
+
+
+def os_auth_scheme_from_string(string):
+    if string in ('passthrough', 'userpass', 'legacy'):
+        return string
+    return None
+
+
+option_registry.register(
+    Option('os_auth_scheme', convert=os_auth_scheme_from_string,
+           help='''OpenStack authentication scheme for the backend.'''))
+
+# Openstack legacy auth scheme
+
+option_registry.register(
+    Option(
+        'os_user', default_from_env=['NOVA_USERNAME'],
+        help='''OpenStack username (os_auth_scheme 'legacy' or 'userpass').'''))
+option_registry.register(
+    Option('os_api_key', default_from_env=['NOVA_API_KEY'],
+           help='''OpenStack API key (os_auth_scheme 'legacy').'''))
+
+# Openstack keystone with credentials (userpass) auth scheme
+
+option_registry.register(
+    Option('os_password', default_from_env=['NOVA_PASSWORD'],
+           help='''OpenStack username (os_auth_scheme 'userpass').'''))
+option_registry.register(
+    Option('os_tenant_id', default_from_env=['NOVA_PROJECT_ID'],
+           help='''OpenStack tenant id (os_auth_scheme 'userpass').'''))

=== modified file 'awsome/proxy_aws.py'
--- awsome/proxy_aws.py	2012-05-04 15:16:28 +0000
+++ awsome/proxy_aws.py	2012-05-15 11:34:38 +0000
@@ -75,7 +75,10 @@
     awsChannelFactory = AwsomeProxyChannel
 
     @classmethod
-    def from_config(cls, userdb, config, address):
+    def from_config(cls, userdb, conf):
+        address = conf.get('aws_url')
         if address is None:
-            address = config.get("aws", "ec2_url")
+            # FIXME: should be tested and probably tracked elsewhere
+            # -- vila 20120515
+            raise ValueError("'aws_url' must be set")
         return cls(userdb, address)

=== modified file 'awsome/proxy_openstack.py'
--- awsome/proxy_openstack.py	2012-05-14 14:01:35 +0000
+++ awsome/proxy_openstack.py	2012-05-15 11:34:38 +0000
@@ -741,15 +741,15 @@
         AwsChannel.__init__(self, userdb, address)
         if auth_version is None:
             auth_version = self._guess_version_from_url(address)
-        if auth_version == 1:
+        if auth_version == 'legacy':
             self.check_signature = True
             self.get_auth_token = self._get_auth_token_client_setup
             self._request_token = self._request_token_v_1
-        elif auth_version == 2:
+        elif auth_version == 'userpass':
             self.check_signature = True
             self.get_auth_token = self._get_auth_token_client_setup
             self._request_token = self._request_token_v_2
-        elif auth_version == 3:
+        elif auth_version == 'passthrough':
             self.check_signature = False
             self.get_auth_token = self._get_auth_token_server_setup
         else:
@@ -761,7 +761,9 @@
     @staticmethod
     def _guess_version_from_url(url):
         final_part = url.rstrip("/").rsplit("/", 1)[-1]
-        version = {"v2.0": 2, "v1.1": 1, "v1.0": 1}.get(final_part)
+        version = {"v2.0": 'userpass',
+                   "v1.1": 'legacy',
+                   "v1.0": 'legacy'}.get(final_part)
         if version is None:
             raise ValueError("Unknown authentication version in url: " + url)
         return version
@@ -864,7 +866,7 @@
                          if k not in ("Signature",))
         deferred = Agent(reactor).request(
             "POST",
-            self.address + "/v2.0/ec2tokens",
+            self.address + "v2.0/ec2tokens",
             Headers({
                 "Accept": ["application/json"],
                 "Content-Type": ["application/json"],
@@ -915,8 +917,8 @@
         # unclear reasons, more tests needed here (this was discovered when an
         # obscure traceback was encountered during the request
         # processing). While an error handler would have made things clearer,
-        # it's still unclear why --auth-version=2 doesn't require such a
-        # conversion. -- vila 20120509
+        # it's still unclear why --os-auth-scheme=userpass doesn't require such
+        # a conversion. -- vila 20120509
         return url, str(token)
 
 
@@ -929,14 +931,16 @@
         self.authver = auth_version
 
     @classmethod
-    def from_config(cls, userdb, config, address, auth_version=None):
+    def from_config(cls, userdb, conf):
+        address = conf.get('os_auth_url')
         if address is None:
-            address = config.get("openstack", "nova_url")
-        if auth_version is None:
-            try:
-                auth_version = config.get("openstack", "auth_version")
-            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-                pass # Leave auth_version as None to guess from url
+            # FIXME: should be tested and probably tracked elsewhere
+            # -- vila 20120515
+            raise ValueError("'os_auth_url' must be set")
+        try:
+            auth_version = conf.get('os_auth_scheme')
+        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+            pass # Leave auth_version as None to guess from url
         return cls(userdb, address, auth_version)
 
     def protocol(self):

=== modified file 'awsome/tests/test_config.py'
--- awsome/tests/test_config.py	2012-05-15 11:34:38 +0000
+++ awsome/tests/test_config.py	2012-05-15 11:34:38 +0000
@@ -175,6 +175,49 @@
         self.assertConverted(16, opt, '16')
 
 
+
+class Os_auth_scheme_OptionTests(unittest.TestCase, OptionConverterMixin):
+
+    def get_option(self):
+        return config.option_registry.get('os_auth_scheme')
+
+    def test_invalid(self):
+        opt = self.get_option()
+        self.assertConvertInvalid(opt, 'foo')
+        self.assertConvertInvalid(opt, '0')
+        self.assertConvertInvalid(opt, '4')
+
+    def test_valid(self):
+        opt = self.get_option()
+        self.assertConverted('passthrough', opt, 'passthrough')
+        self.assertConverted('userpass', opt, 'userpass')
+        self.assertConverted('legacy', opt, 'legacy')
+
+
+class Backend_OptionTests(unittest.TestCase, OptionConverterMixin):
+
+    def get_option(self):
+        return config.option_registry.get('backend')
+
+    def test_invalid(self):
+        opt = self.get_option()
+        self.assertConvertInvalid(opt, 'foo')
+
+    def test_valid(self):
+        opt = self.get_option()
+        from awsome import (
+            proxy_aws,
+            proxy_openstack,
+            )
+        self.assertConverted(proxy_aws.AwsomeProxyFactory, opt, 'aws')
+        self.assertConverted(proxy_openstack.OpenStackProxyFactory,
+                             opt, 'openstack')
+
+
+_unitialized_attr = object()
+"""A sentinel needed to act as a default value in a method signature."""
+
+
 class OptionRegistryTests(unittest.TestCase):
 
     def setUp(self):

=== modified file 'awsome/users.py'
--- awsome/users.py	2012-05-14 14:01:35 +0000
+++ awsome/users.py	2012-05-15 11:34:38 +0000
@@ -53,6 +53,14 @@
         self.password = env.get("NOVA_PASSWORD")
         return self
 
+    @classmethod
+    def from_config(cls, conf):
+        self = cls(conf.get('aws_access_key'), conf.get('aws_secret_key'))
+        self.nova_key = conf.get('os_api_key')
+        self.project = conf.get('os_tenant_id')
+        self.username = conf.get('os_user')
+        self.password = conf.get('os_password')
+        return self
 
 class UserDatabase(object):
 

=== modified file 'bin/awsome'
--- bin/awsome	2012-05-15 11:34:38 +0000
+++ bin/awsome	2012-05-15 11:34:38 +0000
@@ -21,93 +21,43 @@
 # Find the awsome lib along the script itself
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import ConfigParser
 from twisted.internet import reactor
 from twisted.python import log
 
-from awsome import (
-    __version__ as awsome_version,
-    DEFAULT_LOG_PATH,
-    DEFAULT_CONFIG_PATH,
-    )
+from awsome import config
 from awsome.users import (
     Credentials,
     UserDatabase,
     )
-import argparse
-
-
-class MultilineVersion(argparse.Action):
-    """Alternative to argparse 'version' action supporting multiline output"""
-
-    def __init__(self, option_strings, message_format,
-            dest=argparse.SUPPRESS, default=argparse.SUPPRESS,
-            help="display version and exit", **kwargs):
-        super(MultilineVersion, self).__init__(option_strings=option_strings,
-            nargs=0, dest=dest, default=default, help=help)
-        self.fmt = message_format
-        self.details = kwargs
-
-    def __call__(self, parser, namespace, values, option_string=None):
-        parser.exit(message=self.fmt % dict(prog=parser.prog, **self.details))
-
-
-parser = argparse.ArgumentParser(description="AWS API Proxy")
-parser.add_argument('--backend', type=str, help='backend to use',
-    choices=["aws", "openstack"], default=None)
-parser.add_argument('--config', type=str, help='configuration file to use',
-    default=DEFAULT_CONFIG_PATH)
-parser.add_argument('--auth-version', type=int, default=None, choices=[1, 2, 3],
-    help="openstack auth scheme to use (default autodetect)")
-parser.add_argument('--port', type=int, default=8080,
-    help="local port to listen on")
-parser.add_argument("--version", action=MultilineVersion,
-    message_format="%(prog)s %(version)s\n%(copy)s\n",
-    version=awsome_version, copy="(C) 2012 Canonical Ltd.")
-parser.add_argument("--log-file", type=str, default=None,
-    help="path to log file")
-args = parser.parse_args()
+
+conf = config.Config()
+parser, args = conf.from_cmdline(sys.argv[1:])
+conf_path = conf.get('config')
+conf.read([conf_path])
+
 
 userdb = UserDatabase()
-credentials = Credentials.from_environment()
+# FIXME: building credentials from the script forbids testing. Moreover, it
+# relies on env variables being set which is not true in all environments
+# -- vila 20120515
+credentials = Credentials.from_config(conf)
 userdb.add_user(credentials)
 
-config = ConfigParser.ConfigParser()
-config.read([args.config])
-
-try:
-    backend = config.get("DEFAULT", "backend")
-except ConfigParser.NoOptionError:
-    backend = "aws"
-if args.backend is not None:
-    backend = args.backend
-
-if backend == "aws":
-    if args.auth_version is not None:
-        parser.error("Only use --auth-version with openstack backend")
-    from awsome.proxy_aws import AwsomeProxyFactory
-    factory_cls = AwsomeProxyFactory
-    forwarding_address = os.environ.get("EC2_URL")
-    extra = []
-elif backend == "openstack":
-    from awsome.proxy_openstack import OpenStackProxyFactory
-    factory_cls = OpenStackProxyFactory
-    forwarding_address = os.environ.get("NOVA_URL")
-    extra = [args.auth_version]
-
-proxy = factory_cls.from_config(userdb, config, forwarding_address, *extra)
-
-log_file = args.log_file
-if log_file is None:
-    try:
-        log_file = config.get("DEFAULT", "log_file")
-    except ConfigParser.NoOptionError:
-        log_file = DEFAULT_LOG_PATH
-
+
+factory_cls = conf.get('backend')
+if factory_cls is None:
+    parser.error('No backend specified')
+
+proxy = factory_cls.from_config(userdb, conf)
+
+# FIXME: The log_file defined in the config file (or the default value) is
+# never used since args.log_file (even when None) takes precedence
+# -- vila 20120515
 if args.log_file is None:
     log.startLogging(sys.stdout)
 else:
+    log_file = conf.get('log_file')
     logf = open(log_file, 'a')
     log.startLogging(logf)
-reactor.listenTCP(args.port, proxy)
+reactor.listenTCP(conf.get('port'), proxy)
 reactor.run()

=== modified file 'man/awsome.conf.5'
--- man/awsome.conf.5	2012-04-25 12:59:59 +0000
+++ man/awsome.conf.5	2012-05-15 11:34:38 +0000
@@ -12,21 +12,21 @@
 \fBlog_file\fR
 Path to log file.
 .SH "AWS OPTIONS"
-Options for the AWS backend are specified in the [aws] section.
+Options for the AWS backend.
 .TP
-\fBec2_url\fR
+\fBaws_url\fR
 The https url of the EC2 server to connect to.
 .TP
-\fBec2_access_key\fR
+\fBaws_access_key\fR
 Access Key Id for the account.
 .TP
-\fBec2_secret_key\fR
+\fBaws_secret_key\fR
 Secret Access Key for the account.
 .SH "OPENSTACK OPTIONS"
-Options for the OpenStack backend are specified in the [openstack] section.
+Options for the OpenStack backend.
 .TP
-\fBauth_version\fR
-OpenStack auth scheme to use (1 or 2). If this isn't set explicitly it will
+\fBos_auth_scheme\fR
+OpenStack auth scheme to use. If this isn't set explicitly it will
 be autodetected.
 .SH "SEE ALSO"
 \fUhttps://launchpad.net/awsome\fR, awsome(1)

=== modified file 'tools/README.essex-precise'
--- tools/README.essex-precise	2012-05-09 08:14:29 +0000
+++ tools/README.essex-precise	2012-05-15 11:34:38 +0000
@@ -54,7 +54,7 @@
 
 Note that the previous step (setup devstack) leaves a running devstack
 already. When re-using the vm instance and the devstack setup, running
-``.stack.sh`` is all that is needed (and faster too).
+``./stack.sh`` is all that is needed (and faster too).
 
 
 # Populate keystone db, from your local host, keeping track of the
@@ -81,5 +81,12 @@
 The following command is needed to point awsome to the devstack keystone
 server:
 
-  NOVA_URL=http://essex-precise.local:5000/ bin/awsome --backend=openstack --auth-version=3
-
+  bin/awsome --backend=openstack --os-auth-url=http://essex-precise.local:5000/ --os-auth-scheme=passthrough 
+
+Exercise awsome
+---------------
+
+To smoke test that everything is setup correctly, the following command can
+be used (while awsome is running in another terminal):
+
+EC2_URL=http://localhost:8080 EC2_ACCESS_KEY=<access> EC2_SECRET_KEY=<secret> euca-describe-images