Merge lp:~abentley/charms/precise/juju-reports/stop-on-ssh-source into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Fix new deploy problems.

This fixes two issues that were discovered when spinning up the juju-ci4 env.

First, it attempts to use bzr+ssh urls when there's no lp ssh key, causing the unit to error.

Second, it assumes that the mongodb charm will always supply replset, when in fact, the trusty charm supplies replset only when there are more than one units.

This branch changes the charm so that it stops, instead of erroring, when it can't use a bzr+ssh url. It changes the mongodb handling so that uses replset only when supplied.

[Martin Packman (gz)]

Looks good. Wasn't sure about the stop vs error on bzr+ssh but it's clear from the code that's the right thing.

review: Approve

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-01-12 19:11:34 +0000
+++ hooks/common.py	2015-02-05 15:04:08 +0000
@@ -138,7 +138,7 @@
 
 def configure_lp(ssh_key):
     if ssh_key == '':
-        return
+        return False
     with open_secret('/root/.ssh/lp_rsa') as key_file:
         key_file.write(ssh_key)
     pwd = getpwnam('ubuntu')
@@ -147,6 +147,7 @@
         key_file.write(ssh_key)
     # Login to LP
     call_bzr(['lp-login', 'juju-qa-bot'])
+    return True
 
 
 def call_bzr(args):
@@ -238,15 +239,18 @@
                 'hostname' not in relation_data):
                 continue
             if replset is None:
-                replset = relation_data['replset']
+                replset = relation_data.get('replset')
             # All units should be members of the same replication set.
-            elif replset != relation_data['replset']:
+            if replset is not None and replset != relation_data['replset']:
                 raise AssertionError('DB instances are from different sets!')
             host_ports.append(
                 '%(hostname)s:%(port)s' % relation_data)
     if len(host_ports) == 0:
         return ''
-    return 'mongodb://%s/?replicaSet=%s' % (','.join(host_ports), replset)
+    replica_str = ''
+    if replset is not None:
+        replica_str = '?replicaSet=%s' % replset
+    return 'mongodb://%s/%s' % (','.join(host_ports), replica_str)
 
 
 def update_website(ini):
@@ -315,10 +319,13 @@
     mongo_url = get_mongo_url()
     config = hookenv.config()
     set_port(ini, False)
-    configure_lp(config['lp-key'])
+    has_lp_key = configure_lp(config['lp-key'])
     if config['source'] == '':
         hookenv.log('Incomplete config: source')
         return
+    if not has_lp_key and config['source'].startswith('bzr+ssh'):
+        hookenv.log('Incomplete config: ssh URL but no LP key')
+        return
     last_source_url, last_revision = get_last_revision()
     needs_install_update = (
         (last_source_url, last_revision) != (config['source'], config['revno'])