Merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine
- webui-rabbit-credentials
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | 792 |
Merged at revision: | 826 |
Proposed branch: | lp:~cprov/uci-engine/webui-rabbit-credentials |
Merge into: | lp:uci-engine |
Diff against target: |
216 lines (+28/-18) 14 files modified
charms/precise/wsgi-app/config.yaml (+4/-0) charms/precise/wsgi-app/hooks/hooks.py (+6/-2) juju-deployer/branch-source-builder.yaml.tmpl (+1/-1) juju-deployer/britney-proxy.yaml.tmpl (+1/-1) juju-deployer/image-builder.yaml.tmpl (+1/-1) juju-deployer/lander.yaml.tmpl (+1/-1) juju-deployer/ppa-creator.yaml.tmpl (+1/-1) juju-deployer/publisher.yaml.tmpl (+1/-1) juju-deployer/test-runner.yaml.tmpl (+1/-1) juju-deployer/ticket-system.yaml.tmpl (+1/-1) juju-deployer/validator.yaml.tmpl (+1/-1) juju-deployer/webui.yaml.tmpl (+2/-0) tests/test_cli.py (+2/-2) webui/status/views.py (+5/-5) |
To merge this branch: | bzr merge lp:~cprov/uci-engine/webui-rabbit-credentials |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Francis Ginther | Approve | ||
Review via email: mp+233037@code.launchpad.net |
Commit message
Using acquired credentials to access rabbitmq management API and fixing Health-Engine.
Description of the change
Using acquired credentials to access rabbitmq management API.
Since the feature to create administrators users is only available in trunk (@57) I took the opportunity to switch over @59 (current trunk). Testing deployment is working fine and our local fix for https:/
Celso Providelo (cprov) wrote : | # |
Celso Providelo (cprov) wrote : | # |
Needs another re-fix in trunk: https:/
Celso Providelo (cprov) wrote : | # |
Since we can't wait for https:/
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:784
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Francis Ginther (fginther) wrote : | # |
juju-deployer/
Celso Providelo (cprov) wrote : | # |
Francis,
Thanks for the comments, old code comments removed and britney configuration also updated.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:785
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Francis Ginther (fginther) wrote : | # |
Thanks Celso.
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint 6853ec70181773c
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmpUFQrpB/
Problem deploying "ci-airline": Command '['juju-deployer', '-v', '-c', '/tmp/tmpUFQrpB
INFO:root:Creating a virtualenv to run under...
INFO:root:Asked to set the env to the virtualenv at /dev/shm/
INFO:root:
INFO:root:
key_read: uudecode AAAAB3NzaC1yc2E
failed
INFO:requests.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:786
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint 37ce2f1b285ad78
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmp0z0Iof/
Tests running...
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
We should put the rabbit charm specification in its own deployer yaml. Updating it to perfectly match in N places is silly.
Celso Providelo (cprov) wrote : | # |
Well, I agre and definitely don't want to do that again.
Self-contained (aka duplicated) specs gives us the ability to deploy a
functional single service by passing only *one* argument to deploy.py
... splitting a 'rabbit' configuration out would require '<service>
rabbit' arguments (not a big deal IMHO).
I will propose that change during the standup and land it if no one
gets upset about it.
On Fri, Sep 26, 2014 at 6:51 AM, Evan Dandrea
<email address hidden> wrote:
> We should put the rabbit charm specification in its own deployer yaml. Updating it to perfectly match in N places is silly.
> --
> https:/
> You are the owner of lp:~cprov/uci-engine/webui-rabbit-credentials.
--
Celso Providelo
<email address hidden>
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Checking juju status
Private PPAs: disabled
Preparing local branch upload...
Uploading local branch, fingerprint 57550c85f5af2cb
Building charm: lander
Building charm: wsgi-app
Building charm: rabbitmq-worker
Building charm: webui
Building charm: key-secret-
Building charm: system-image-server
Building charm: chroot-builder
Installing keys from bzr+ssh:
Running juju-deployer -v -c /tmp/tmp0JRU8D/
Tests running...
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
ci-utils.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:787
http://
Executed test runs:
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:788
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
2014-09-27 11:21:23 INFO juju.cmd supercommand.go:37 running jujud [1.20.7.
2014-09-27 11:21:23 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-09-27 11:21:23 INFO juju.jujud unit.go:78 unit agent unit-ci-
2014-09-27 11:21:23 INFO juju.worker runner.go:260 start "api"
2014-09-27 11:21:23 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-27 11:21:23 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-27 11:21:23 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-27 11:21:23 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-27 11:21:24 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-09-27 11:21:24 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-09-27 11:21:24 INFO juju.worker runner.go:260 start "upgrader"
2014-09-27 11:21:24 INFO juju.worker runner.go:260 start "logger"
2014-09-27 11:21:24 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-09-27 11:21:24 INFO juju.worker runner.go:260 start "uniter"
2014-09-27 11:21:25 DEBUG juju.worker.logger logger.go:60 logger setup
2014-09-27 11:21:24 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-09-27 11:21:24 INFO juju.worker runner.go:260 start "rsyslog"
2014-09-27 11:21:25 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-
2014-09-27 11:21:25 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>
2014-09-27 11:22:05 INFO juju-log Installing python-jinja2 with options: ['--option=
2014-09-27 11:22:50 INFO install Reading package lists...
2014-09-27 11:22:51 INFO install Building dependency tree...
2014-09-27 11:22:51 INFO install Reading state information...
2014-09-27 11:22:52 INFO install The following extra packages will be installed:
2014-09-27 11:22:52 INFO install python-markupsafe
2014-09-27 11:22:52 INFO install Suggested packages:
2014-09-27 11:22:52 INFO install python-jinja2-doc
2014-09-27 11:22:52 INFO install The following NEW packages will be installed:
2014-09-27 11:22:52 INFO install python-jinja2 python-markupsafe
2014-09-27 11:22:52 INFO install 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
2014-09-27 11:22:52 INFO install Need to get 172 kB of archives.
2014-09-27 11:22:52 INFO install After this operation, 1124 kB of additional disk space will be used.
2014-09-27 11:22:52 INFO install Get:1 http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:790
http://
Executed test runs:
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:792
http://
Executed test runs:
Click here to trigger a rebuild:
http://
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
2014-10-01 13:54:10 INFO juju.cmd supercommand.go:37 running jujud [1.20.8.
2014-10-01 13:54:10 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-10-01 13:54:10 INFO juju.jujud unit.go:78 unit agent unit-ci-
2014-10-01 13:54:10 INFO juju.worker runner.go:260 start "api"
2014-10-01 13:54:10 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-01 13:54:10 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-01 13:54:10 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-01 13:54:10 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-01 13:54:16 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-01 13:54:16 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-01 13:54:16 INFO juju.worker runner.go:260 start "upgrader"
2014-10-01 13:54:16 INFO juju.worker runner.go:260 start "logger"
2014-10-01 13:54:16 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-10-01 13:54:16 INFO juju.worker runner.go:260 start "uniter"
2014-10-01 13:54:16 DEBUG juju.worker.logger logger.go:60 logger setup
2014-10-01 13:54:16 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-10-01 13:54:16 INFO juju.worker runner.go:260 start "rsyslog"
2014-10-01 13:54:16 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-
2014-10-01 13:54:16 INFO juju.worker.
2014-10-01 13:54:16 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>
2014-10-01 13:54:23 INFO juju-log Installing ['python-psycopg2', 'python-jinja2'] with options: ['--option=
2014-10-01 13:54:50 INFO install Reading package lists...
2014-10-01 13:54:51 INFO install Building dependency tree...
2014-10-01 13:54:51 INFO install Reading state information...
2014-10-01 13:54:51 INFO install The following extra packages will be installed:
2014-10-01 13:54:51 INFO install libpq5 python-
2014-10-01 13:54:51 INFO install Suggested packages:
2014-10-01 13:54:51 INFO install python-
2014-10-01 13:54:51 INFO install python-
2014-10-01 13:54:51 INFO install python-psycopg2-doc
2014-10-01 13:54:51 INFO install The following NEW packages will be installed:
2014-10-01 13:54:51 INFO install ...
Ubuntu CI Bot (uci-bot) wrote : | # |
The attempt to merge lp:~cprov/uci-engine/webui-rabbit-credentials into lp:uci-engine failed. Below is the output from the failed tests.
Running cm...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
Updating source dependencies...
uploading webui-content.tgz to swift
Updating source dependencies...
2014-10-03 18:09:15 INFO juju.cmd supercommand.go:37 running jujud [1.20.8.
2014-10-03 18:09:15 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2014-10-03 18:09:15 INFO juju.jujud unit.go:78 unit agent unit-ci-
2014-10-03 18:09:15 INFO juju.worker runner.go:260 start "api"
2014-10-03 18:09:15 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-03 18:09:15 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-03 18:09:15 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-03 18:09:15 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-03 18:09:17 INFO juju.state.api apiclient.go:242 dialing "wss://
2014-10-03 18:09:17 INFO juju.state.api apiclient.go:176 connection established to "wss://
2014-10-03 18:09:17 INFO juju.worker runner.go:260 start "upgrader"
2014-10-03 18:09:17 INFO juju.worker runner.go:260 start "logger"
2014-10-03 18:09:17 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2014-10-03 18:09:17 INFO juju.worker runner.go:260 start "uniter"
2014-10-03 18:09:17 DEBUG juju.worker.logger logger.go:60 logger setup
2014-10-03 18:09:17 INFO juju.worker runner.go:260 start "apiaddressupdater"
2014-10-03 18:09:17 INFO juju.worker runner.go:260 start "rsyslog"
2014-10-03 18:09:17 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-
2014-10-03 18:09:17 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>
2014-10-03 18:09:38 INFO juju-log Installing ['python-psycopg2', 'python-jinja2'] with options: ['--option=
2014-10-03 18:10:11 INFO install Reading package lists...
2014-10-03 18:10:17 INFO install Building dependency tree...
2014-10-03 18:10:17 INFO install Reading state information...
2014-10-03 18:10:18 INFO install The following extra packages will be installed:
2014-10-03 18:10:18 INFO install libpq5 python-
2014-10-03 18:10:18 INFO install Suggested packages:
2014-10-03 18:10:18 INFO install python-
2014-10-03 18:10:18 INFO install python-
2014-10-03 18:10:18 INFO install python-psycopg2-doc
2014-10-03 18:10:18 INFO install The following NEW packages will be installed:
2014-10-03 18:10:18 INFO install libpq5 python-
2014-10-03 18:10:18 INFO ...
Preview Diff
1 | === modified file 'charms/precise/wsgi-app/config.yaml' |
2 | --- charms/precise/wsgi-app/config.yaml 2014-07-29 17:45:09 +0000 |
3 | +++ charms/precise/wsgi-app/config.yaml 2014-10-01 12:53:07 +0000 |
4 | @@ -51,6 +51,10 @@ |
5 | type: string |
6 | default: '/' |
7 | description: The vhost in the rabbitMQ server. |
8 | + amqp-admin: |
9 | + type: boolean |
10 | + default: false |
11 | + description: Whether or not the user should have administration rights. |
12 | |
13 | # required for the gunicorn charm: |
14 | port: |
15 | |
16 | === modified file 'charms/precise/wsgi-app/hooks/hooks.py' |
17 | --- charms/precise/wsgi-app/hooks/hooks.py 2014-09-26 22:03:46 +0000 |
18 | +++ charms/precise/wsgi-app/hooks/hooks.py 2014-10-01 12:53:07 +0000 |
19 | @@ -438,7 +438,7 @@ |
20 | return path # not yet ready |
21 | |
22 | with tempfile.NamedTemporaryFile('w', delete=False) as f: |
23 | - f.write('# DO NOT EDIT. Generated by rabbitmq-worker charm hook\n') |
24 | + f.write('# Automatically-generated by Juju. DO NOT EDIT MANUALLY.\n') |
25 | f.write('AMQP_USER = "%s"\n' % config['amqp-user']) |
26 | f.write('AMQP_VHOST = "%s"\n' % config['amqp-vhost']) |
27 | f.write('AMQP_HOST = "%s"\n' % relation['private-address']) |
28 | @@ -456,7 +456,11 @@ |
29 | def amqp_relation_joined(): |
30 | config = charmhelpers.core.hookenv.config() |
31 | charmhelpers.core.hookenv.relation_set( |
32 | - None, {'username': config['amqp-user'], 'vhost': config['amqp-vhost']}) |
33 | + None, { |
34 | + 'username': config['amqp-user'], |
35 | + 'vhost': config['amqp-vhost'], |
36 | + 'admin': config['amqp-admin'], |
37 | + }) |
38 | |
39 | |
40 | @hooks.hook() |
41 | |
42 | === modified file 'juju-deployer/branch-source-builder.yaml.tmpl' |
43 | --- juju-deployer/branch-source-builder.yaml.tmpl 2014-09-30 15:50:53 +0000 |
44 | +++ juju-deployer/branch-source-builder.yaml.tmpl 2014-10-01 12:53:07 +0000 |
45 | @@ -30,7 +30,7 @@ |
46 | gpg-secret-keyring: include-base64://keys/gpg.sec |
47 | gpg-public-keyring: include-base64://keys/gpg.pub |
48 | ci-airline-rabbit: |
49 | - branch: lp:charms/precise/rabbitmq-server@55 |
50 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
51 | charm: rabbitmq |
52 | num_units: 1 |
53 | options: |
54 | |
55 | === modified file 'juju-deployer/britney-proxy.yaml.tmpl' |
56 | --- juju-deployer/britney-proxy.yaml.tmpl 2014-10-01 08:55:19 +0000 |
57 | +++ juju-deployer/britney-proxy.yaml.tmpl 2014-10-01 12:53:07 +0000 |
58 | @@ -34,7 +34,7 @@ |
59 | install_keys: | |
60 | - "" |
61 | ci-airline-rabbit: |
62 | - branch: lp:charms/precise/rabbitmq-server@55 |
63 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
64 | charm: rabbitmq |
65 | num_units: 1 |
66 | options: |
67 | |
68 | === modified file 'juju-deployer/image-builder.yaml.tmpl' |
69 | --- juju-deployer/image-builder.yaml.tmpl 2014-09-30 15:50:53 +0000 |
70 | +++ juju-deployer/image-builder.yaml.tmpl 2014-10-01 12:53:07 +0000 |
71 | @@ -20,7 +20,7 @@ |
72 | - null |
73 | - null |
74 | ci-airline-rabbit: |
75 | - branch: lp:charms/precise/rabbitmq-server@55 |
76 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
77 | charm: rabbitmq |
78 | num_units: 1 |
79 | options: |
80 | |
81 | === modified file 'juju-deployer/lander.yaml.tmpl' |
82 | --- juju-deployer/lander.yaml.tmpl 2014-09-30 15:50:53 +0000 |
83 | +++ juju-deployer/lander.yaml.tmpl 2014-10-01 12:53:07 +0000 |
84 | @@ -29,7 +29,7 @@ |
85 | unit-config: include-base64://configs/unit_config.yaml |
86 | main: ./run-python ./lander/lander/run_worker.py --service-name ci-airline-ts-django --service-port 8080 --delay 10 |
87 | ci-airline-rabbit: |
88 | - branch: lp:charms/precise/rabbitmq-server@55 |
89 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
90 | charm: rabbitmq |
91 | num_units: 1 |
92 | options: |
93 | |
94 | === modified file 'juju-deployer/ppa-creator.yaml.tmpl' |
95 | --- juju-deployer/ppa-creator.yaml.tmpl 2014-09-30 15:50:53 +0000 |
96 | +++ juju-deployer/ppa-creator.yaml.tmpl 2014-10-01 12:53:07 +0000 |
97 | @@ -17,7 +17,7 @@ |
98 | - null |
99 | - null |
100 | ci-airline-rabbit: |
101 | - branch: lp:charms/precise/rabbitmq-server@55 |
102 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
103 | charm: rabbitmq |
104 | num_units: 1 |
105 | options: |
106 | |
107 | === modified file 'juju-deployer/publisher.yaml.tmpl' |
108 | --- juju-deployer/publisher.yaml.tmpl 2014-09-30 15:50:53 +0000 |
109 | +++ juju-deployer/publisher.yaml.tmpl 2014-10-01 12:53:07 +0000 |
110 | @@ -24,7 +24,7 @@ |
111 | # (10 + 3 + 1) minutes = 840s |
112 | nagios_check_health_params: -t 840 publisher.health |
113 | ci-airline-rabbit: |
114 | - branch: lp:charms/precise/rabbitmq-server@55 |
115 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
116 | charm: rabbitmq |
117 | num_units: 1 |
118 | options: |
119 | |
120 | === modified file 'juju-deployer/test-runner.yaml.tmpl' |
121 | --- juju-deployer/test-runner.yaml.tmpl 2014-09-30 15:50:53 +0000 |
122 | +++ juju-deployer/test-runner.yaml.tmpl 2014-10-01 12:53:07 +0000 |
123 | @@ -21,7 +21,7 @@ |
124 | nagios_context: ci-airline-staging |
125 | nagios_check_health_params: -t 7800 test_runner.health |
126 | ci-airline-rabbit: |
127 | - branch: lp:charms/precise/rabbitmq-server@55 |
128 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
129 | charm: rabbitmq |
130 | num_units: 1 |
131 | options: |
132 | |
133 | === modified file 'juju-deployer/ticket-system.yaml.tmpl' |
134 | --- juju-deployer/ticket-system.yaml.tmpl 2014-09-30 21:47:35 +0000 |
135 | +++ juju-deployer/ticket-system.yaml.tmpl 2014-10-01 12:53:07 +0000 |
136 | @@ -53,7 +53,7 @@ |
137 | options: |
138 | wsgi_wsgi_file: ticket_system.wsgi:application |
139 | ci-airline-rabbit: |
140 | - branch: lp:charms/precise/rabbitmq-server@55 |
141 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
142 | charm: rabbitmq |
143 | num_units: 1 |
144 | options: |
145 | |
146 | === modified file 'juju-deployer/validator.yaml.tmpl' |
147 | --- juju-deployer/validator.yaml.tmpl 2014-09-30 15:50:53 +0000 |
148 | +++ juju-deployer/validator.yaml.tmpl 2014-10-01 12:53:07 +0000 |
149 | @@ -21,7 +21,7 @@ |
150 | nagios_context: ci-airline-staging |
151 | nagios_check_health_params: -t 1200 validator.health |
152 | ci-airline-rabbit: |
153 | - branch: lp:charms/precise/rabbitmq-server@55 |
154 | + branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server-trunk-transition |
155 | charm: rabbitmq |
156 | num_units: 1 |
157 | options: |
158 | |
159 | === modified file 'juju-deployer/webui.yaml.tmpl' |
160 | --- juju-deployer/webui.yaml.tmpl 2014-08-29 20:17:00 +0000 |
161 | +++ juju-deployer/webui.yaml.tmpl 2014-10-01 12:53:07 +0000 |
162 | @@ -33,6 +33,8 @@ |
163 | packages: python-amqplib |
164 | python_path: ./webui:./ci-utils |
165 | unit-config: include-base64://configs/unit_config.yaml |
166 | + amqp-user: webui |
167 | + amqp-admin: true |
168 | json_status_path: api/v1/status/ |
169 | log_level: DEBUG |
170 | install_sources: | |
171 | |
172 | === modified file 'tests/test_cli.py' |
173 | --- tests/test_cli.py 2014-09-23 12:25:37 +0000 |
174 | +++ tests/test_cli.py 2014-10-01 12:53:07 +0000 |
175 | @@ -91,7 +91,7 @@ |
176 | def test_update_ticket_attributes(self): |
177 | # An existing ticket can be updated using the CLI. |
178 | num_tickets = self.get_tickets_count() |
179 | - ticket_id = self.get_tickets(offset=num_tickets - 1)[0]['id'] |
180 | + ticket_id = self.get_tickets(offset=num_tickets - 1)[0]['uuid'] |
181 | args = [ |
182 | '--url', self.url, |
183 | 'update_ticket', |
184 | @@ -116,7 +116,7 @@ |
185 | # The system will automatically identify and validate the changes |
186 | # and if necessary restart the ticket processing. |
187 | num_tickets = self.get_tickets_count() |
188 | - ticket_id = self.get_tickets(offset=num_tickets - 1)[0]['id'] |
189 | + ticket_id = self.get_tickets(offset=num_tickets - 1)[0]['uuid'] |
190 | changes = get_test_file_path('barfoo_0.1-1_source.changes') |
191 | args = [ |
192 | '--url', self.url, |
193 | |
194 | === modified file 'webui/status/views.py' |
195 | --- webui/status/views.py 2014-09-25 20:41:32 +0000 |
196 | +++ webui/status/views.py 2014-10-01 12:53:07 +0000 |
197 | @@ -20,14 +20,14 @@ |
198 | |
199 | |
200 | def _queue_health(): |
201 | - amqp_server = amqp_utils.get_config().AMQP_HOST |
202 | + amqp_config = amqp_utils.get_config() |
203 | queues = amqp_utils.MONITORED_QUEUES |
204 | - base = 'http://{}:55672'.format(amqp_server) |
205 | + base = 'http://{}:15672'.format(amqp_config.AMQP_HOST) |
206 | |
207 | try: |
208 | - # NOTE: juju leaves this guest/guest and doesn't seem to expose |
209 | - # anything in the relation to override it |
210 | - content = _get(base + '/api/queues', base, 'guest', 'guest') |
211 | + content = _get( |
212 | + base + '/api/queues', base, |
213 | + amqp_config.AMQP_USER, amqp_config.AMQP_PASSWORD) |
214 | data = json.loads(content) |
215 | data = [x for x in data if x['name'] in queues] |
216 | # find missing queues |
The changes on rabbitmq-server charm for creating administrator users are proposed in https:/ /code.launchpad .net/~cprov/ charms/ precise/ rabbitmq- server/ rabbit- admin/+ merge/233205