Merge lp:~cprov/adt-cloud-worker/basic-config into lp:adt-cloud-worker

[Celso Providelo]

Basic configuration file support (INI-style with common sections across similar microservices). Also adding support for configuring nova OS_ environment.

Basic configuration file support (INI-style with common sections across similar microservices). Also adding support for configuring nova OS_ environment.

=== added file '.adt-service.conf'
--- .adt-service.conf	1970-01-01 00:00:00 +0000
+++ .adt-service.conf	2015-03-03 02:17:13 +0000
@@ -0,0 +1,16 @@
+# `adt-cloud-worker` configuration file.
+[adt]
+name = foo
+# <arch>.<platform>[ ...]
+tags = i386.nova amd64.nova
+
+[amqp]
+uris = amqp://guest:guest@localhost:5672//
+
+[nova]
+# Matching OS_ env_vars.
+os_username = foo
+os_tenant_name = foo_project
+os_password = <redacted>
+os_auth_url = https://keystone.canonistack.canonical.com:443/v2.0/
+os_region_name = lcy01
 
=== modified file 'README.rst'
--- README.rst	2015-03-03 00:30:40 +0000
+++ README.rst	2015-03-03 02:17:13 +0000
@@ -9,18 +9,48 @@
 Get the Source
 ==============
 
-	$ bzr branch lp:adt-cloud-worker
+Branch the code::
+
+  $ bzr branch lp:adt-cloud-worker
 
 Install the dependencies
 ========================
 
-	$ sudo apt-get install python3-kombu
+Install dependencies::
+
+  $ sudo add-apt-repository ppa:canonical-ci-engineering/phase0
+  $ sudo apt-get update
+  $ sudo apt-get install python3-kombu
 
 Run the Service
 ===============
 
-Running the executable without arguments will print help:
-
-	$ ./adt-cloud-worker.py 
-
-...you will need to specify some options in order for it to do anything sensible.
 \ No newline at end of file
+Creating/updating the sample configuration file in '.adt-service.conf'::
+
+  [adt]
+  name = foo
+  tags = i386.nova amd64.nova
+
+  [amqp]
+  uris = amqp://guest:guest@localhost:5672//
+
+  [nova]
+  os_username = foo
+  os_tenant_name = foo_project
+  os_password = xxx
+  os_auth_url = http://172.20.161.138:5000/v2.0/
+  os_region_name = bot_prototype
+ 
+Running the executable for help::
+
+  $ ./adt-cloud-worker.py -h
+  usage: adt-cloud-worker.py [-h] [-c CONF]
+
+  ADT worker ...
+
+  optional arguments:
+    -h, --help            show this help message and exit
+    -c CONF, --conf CONF  Configuration file path
+
+It's possible to run multiple instances of the worker in the same machine
+by providing diffent working directories of configuration file path.
 
=== modified file 'adt-cloud-worker.py'
--- adt-cloud-worker.py	2015-03-03 01:21:54 +0000
+++ adt-cloud-worker.py	2015-03-03 02:17:13 +0000
@@ -23,6 +23,7 @@
 from __future__ import print_function
 
 import argparse
+import configparser
 import kombu
 from kombu.log import get_logger
 from kombu.mixins import ConsumerMixin
@@ -121,6 +122,7 @@
         subprocess.check_call(['adt-run'] + arguments)
     except subprocess.CalledProcessError as e:
         # log?
+        # TODO: filter log content to avoid leaking cloud credentials.
         return e.returncode
     return 0
 
@@ -128,24 +130,34 @@
 def main():
     setup_logging(loglevel='DEBUG', loggers=[''])
 
-    parser = argparse.ArgumentParser(description='ADT worker ...')
-    parser.add_argument('name', help='Worker name')
-    parser.add_argument('-t', '--tags', dest='tags',
-                        default=['i386.nova'], action='append',
-                        help='Target tag (<arch>.<platform>)')
+    parser = argparse.ArgumentParser(
+        description='ADT cloud worker ...')
+    parser.add_argument('-c', '--conf', default='.adt-service.conf',
+                        help='Configuration file path')
     args = parser.parse_args()
 
+    # Load configuration options.
+    config = configparser.ConfigParser()
+    config.read(args.conf)
+    worker_name = config.get('adt', 'name')
+    routing_keys = config.get('adt', 'tags').split()
+    amqp_uris = config.get('amqp', 'uris').split()
+
+    # Setup nova environment variables based on the configuration file.
+    for k, v in config.items('nova'):
+        os.environ[k.upper()] = str(v)
+
     adt_exchange = kombu.Exchange("adt.exchange", type="topic")
     queues = []
-    for tag in set(args.tags):
+    for routing_key in routing_keys:
         queues.append(
-            kombu.Queue('adt.requests.{}'.format(tag) ,
-                        adt_exchange, routing_key=tag)
+            kombu.Queue('adt.requests.{}'.format(routing_key) ,
+                        adt_exchange, routing_key=routing_key)
         )
 
-    with kombu.Connection('amqp://guest:guest@localhost:5672//') as conn:
+    with kombu.Connection(amqp_uris) as conn:
         try:
-            worker = Worker(args.name, conn, queues)
+            worker = Worker(worker_name, conn, queues)
             worker.run()
         except KeyboardInterrupt:
             print('Bye!')