Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-separate-creds into lp:adt-cloud-worker

[Thomi Richards]

Split credentials for launching ephemeral testbed instances from talking to swift.

Split credentials for launching ephemeral testbed instances from talking to swift.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'README.rst'
--- README.rst	2015-04-29 03:23:22 +0000
+++ README.rst	2015-05-07 22:12:37 +0000
@@ -64,19 +64,38 @@
 
 Creating/updating the sample configuration file in 'adt-service.conf'::
 
+  # `adt-cloud-worker` configuration file.
   [adt]
-  name = foo
-  tags = i386.nova amd64.nova
-
+  archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
+  #http_proxy = http://squid.internal:3128/
+  
+  # These determine how adt-run will boot nova instances.
+  os_username = foo
+  os_tenant_name = foo_project
+  os_password = <redacted>
+  os_auth_url = http://172.20.161.138:5000/v2.0/
+  os_region_name = bot-prototype
+  extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
+  
   [amqp]
   uris = amqp://guest:guest@localhost:5672//
-
+  
   [nova]
+  # These determine how this service talks to swift.
   os_username = foo
   os_tenant_name = foo_project
-  os_password = xxx
+  os_password = <redacted>
   os_auth_url = http://172.20.161.138:5000/v2.0/
-  os_region_name = bot_prototype
+  os_region_name = bot-prototype
+  
+  [logstash]
+  host = localhost
+  port = 5959
+  version = 1
+
+ The logstash section is optional. If it's present, a logstash logging handler will be configured with those details.
+
+ Note that there are two sets of openstack authentication details. The [adt] section contains the details that adt-run will use to spawn testbed instances. The service reads these and exports them as environment variables that adt-run then reads. The [nova] section contains the options used to talk to swift (for publishing results) and glance (for grabbing image names).
  
 Running the executable for help::
 

=== modified file 'adt-service.conf'
--- adt-service.conf	2015-04-27 20:01:09 +0000
+++ adt-service.conf	2015-05-07 22:12:37 +0000
@@ -3,17 +3,24 @@
 archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
 #http_proxy = http://squid.internal:3128/
 
+# These determine how adt-run will boot nova instances.
+os_username = foo
+os_tenant_name = foo_project
+os_password = <redacted>
+os_auth_url = http://172.20.161.138:5000/v2.0/
+os_region_name = bot-prototype
+extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
+
 [amqp]
 uris = amqp://guest:guest@localhost:5672//
 
 [nova]
-# Matching OS_ env_vars.
+# These determine how this service talks to swift.
 os_username = foo
 os_tenant_name = foo_project
 os_password = <redacted>
 os_auth_url = http://172.20.161.138:5000/v2.0/
 os_region_name = bot-prototype
-extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
 
 [logstash]
 host = localhost

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-04-29 01:10:15 +0000
+++ adt_cloud_worker/__init__.py	2015-05-07 22:12:37 +0000
@@ -59,7 +59,7 @@
         self.connection = connection
         self.config = config
         # Set the nova configuration env vars:
-        _set_nova_environment_variables(self.config.items('nova'))
+        _set_nova_environment_variables(self.config.items('adt'))
         # Worker is named after the machine hostname created by juju:
         # juju-<env_name>-machine-<machine_number>
         # By getting rid of the '-machine' term, the worker name is
@@ -107,7 +107,7 @@
                 adt_kwargs = body.copy()
                 adt_kwargs['result_dir'] = result_dir
                 adt_kwargs['nova_extra_args'] = self.config.get(
-                    'nova', 'extra_args').split()
+                    'adt', 'extra_args').split()
                 adt_kwargs['nova_flavor'] = get_default_testbed_flavor()
                 adt_kwargs['archive_mirror'] = self.config.get(
                     'adt', 'archive_mirror')