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

[Antoni Segura Puimedon]

[lp:~celebdor/charms/trusty/midonet-agent/cassandra]

36. By Antoni Segura Puimedon <email address hidden> on 2016-02-26

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

[Cory Johns (johnsca)]

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

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-02-16 14:38:28 +0000
+++ tests/basic_deployment.py	2016-02-26 19:55:23 +0000
@@ -100,9 +100,14 @@
         self.d.configure('cassandra', {
             'authenticator': 'AllowAllAuthenticator',
             'cluster_name': 'midonet',
-            'install_keys': '7E41C00F85BFC1706C4FFFB3350200F2B999A372',
+            'install_keys':
+                '[null, '
+                'null, '
+                '7E41C00F85BFC1706C4FFFB3350200F2B999A372]',
             'install_sources':
-            'deb http://debian.datastax.com/community 2.0 main',
+                '[ppa:openjdk-r/ppa, '
+                'ppa:stub/cassandra, '
+                'deb http://debian.datastax.com/community 2.0 main]',
             'extra_packages': 'dsc20'})
 
         self.d.configure('mysql', {'max-connections': 500})