Juju Charms Collection
neutron-agents-midonet package

Merge lp:~celebdor/charms/trusty/neutron-agents-midonet/cassandra into lp:charms/trusty/neutron-agents-midonet

  1. Trusty Tahr (14.04)
  2. cassandra
  3. Merge into trunk
Proposed by Antoni Segura Puimedon
Status: Merged
Merged at revision: 53
Proposed branch: lp:~celebdor/charms/trusty/neutron-agents-midonet/cassandra
Merge into: lp:charms/trusty/neutron-agents-midonet
Diff against target: 19 lines (+7/-1)
1 file modified
tests/basic_deployment.py (+7/-1)
To merge this branch: bzr merge lp:~celebdor/charms/trusty/neutron-agents-midonet/cassandra
Reviewer Review Type Date Requested Status
Cory Johns (community) Approve
Review via email: mp+287336@code.launchpad.net
To post a comment you must log in.
lp:~celebdor/charms/trusty/neutron-agents-midonet/cassandra updated
54. By Antoni Segura Puimedon <email address hidden>

fix lack of null keys so that extra keys and extra sources match

Revision history for this message
Cory Johns (johnsca) wrote :

Thanks for this. It has been merged with the small addition of quotes around the strings in the list.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2016-02-16 14:39:07 +0000
3+++ tests/basic_deployment.py 2016-02-26 19:52:38 +0000
4@@ -140,8 +140,14 @@
5 'authenticator': 'AllowAllAuthenticator',
6 'cluster_name': 'midonet',
7 'install_keys': '7E41C00F85BFC1706C4FFFB3350200F2B999A372',
8+ 'install_keys':
9+ '[null, '
10+ 'null, '
11+ '7E41C00F85BFC1706C4FFFB3350200F2B999A372]',
12 'install_sources':
13- 'deb http://debian.datastax.com/community 2.0 main',
14+ '[ppa:openjdk-r/ppa, '
15+ 'ppa:stub/cassandra, '
16+ 'deb http://debian.datastax.com/community 2.0 main]',
17 'extra_packages': 'dsc20'})
18
19 self.d.configure('mysql', {'max-connections': 500})

Subscribers

People subscribed via source and target branches