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

Proposed by Thomi Richards on 2015-05-07
Status: Merged
Approved by: Thomi Richards on 2015-05-08
Approved revision: 48
Merged at revision: 47
Proposed branch: lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-separate-creds
Merge into: lp:adt-cloud-worker
Diff against target: 101 lines (+36/-10)
3 files modified
README.rst (+25/-6)
adt-service.conf (+9/-2)
adt_cloud_worker/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-separate-creds
Reviewer Review Type Date Requested Status
Celso Providelo (community) 2015-05-07 Approve on 2015-05-08
Review via email: mp+258568@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Celso Providelo (cprov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-04-29 03:23:22 +0000
3+++ README.rst 2015-05-07 22:12:37 +0000
4@@ -64,19 +64,38 @@
5
6 Creating/updating the sample configuration file in 'adt-service.conf'::
7
8+ # `adt-cloud-worker` configuration file.
9 [adt]
10- name = foo
11- tags = i386.nova amd64.nova
12-
13+ archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
14+ #http_proxy = http://squid.internal:3128/
15+
16+ # These determine how adt-run will boot nova instances.
17+ os_username = foo
18+ os_tenant_name = foo_project
19+ os_password = <redacted>
20+ os_auth_url = http://172.20.161.138:5000/v2.0/
21+ os_region_name = bot-prototype
22+ extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
23+
24 [amqp]
25 uris = amqp://guest:guest@localhost:5672//
26-
27+
28 [nova]
29+ # These determine how this service talks to swift.
30 os_username = foo
31 os_tenant_name = foo_project
32- os_password = xxx
33+ os_password = <redacted>
34 os_auth_url = http://172.20.161.138:5000/v2.0/
35- os_region_name = bot_prototype
36+ os_region_name = bot-prototype
37+
38+ [logstash]
39+ host = localhost
40+ port = 5959
41+ version = 1
42+
43+ The logstash section is optional. If it's present, a logstash logging handler will be configured with those details.
44+
45+ 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).
46
47 Running the executable for help::
48
49
50=== modified file 'adt-service.conf'
51--- adt-service.conf 2015-04-27 20:01:09 +0000
52+++ adt-service.conf 2015-05-07 22:12:37 +0000
53@@ -3,17 +3,24 @@
54 archive_mirror = http://nova.clouds.archive.ubuntu.com/ubuntu/
55 #http_proxy = http://squid.internal:3128/
56
57+# These determine how adt-run will boot nova instances.
58+os_username = foo
59+os_tenant_name = foo_project
60+os_password = <redacted>
61+os_auth_url = http://172.20.161.138:5000/v2.0/
62+os_region_name = bot-prototype
63+extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
64+
65 [amqp]
66 uris = amqp://guest:guest@localhost:5672//
67
68 [nova]
69-# Matching OS_ env_vars.
70+# These determine how this service talks to swift.
71 os_username = foo
72 os_tenant_name = foo_project
73 os_password = <redacted>
74 os_auth_url = http://172.20.161.138:5000/v2.0/
75 os_region_name = bot-prototype
76-extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
77
78 [logstash]
79 host = localhost
80
81=== modified file 'adt_cloud_worker/__init__.py'
82--- adt_cloud_worker/__init__.py 2015-04-29 01:10:15 +0000
83+++ adt_cloud_worker/__init__.py 2015-05-07 22:12:37 +0000
84@@ -59,7 +59,7 @@
85 self.connection = connection
86 self.config = config
87 # Set the nova configuration env vars:
88- _set_nova_environment_variables(self.config.items('nova'))
89+ _set_nova_environment_variables(self.config.items('adt'))
90 # Worker is named after the machine hostname created by juju:
91 # juju-<env_name>-machine-<machine_number>
92 # By getting rid of the '-machine' term, the worker name is
93@@ -107,7 +107,7 @@
94 adt_kwargs = body.copy()
95 adt_kwargs['result_dir'] = result_dir
96 adt_kwargs['nova_extra_args'] = self.config.get(
97- 'nova', 'extra_args').split()
98+ 'adt', 'extra_args').split()
99 adt_kwargs['nova_flavor'] = get_default_testbed_flavor()
100 adt_kwargs['archive_mirror'] = self.config.get(
101 'adt', 'archive_mirror')

Subscribers

People subscribed via source and target branches

to all changes: