Merge lp:~raharper/charms/trusty/cinder-vnx/validate_source_and_fail_fast into lp:~alai/charms/trusty/cinder-vnx/trunk

[Ryan Harper]

Validate vnx_source, vnx_source_key, navicli_source, navicli_source_key charm values; Fail relation if invalid since these are required for cinder-vnx to work.

Explicitly list out the packages to be installed

Run apt_install with fatal=True; we want to fail if we cannot install required packages.

Removed dist-upgrade; I don't think it's expected behavior to perform a dist-upgrade when the charm adds or removes the storage relation.

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2014-08-07 00:42:21 +0000
+++ hooks/cinder_hooks.py	2014-08-27 15:14:30 +0000
@@ -7,7 +7,6 @@
     add_source,
     apt_install,
     apt_update,
-    apt_upgrade
 )
 
 from charmhelpers.core.hookenv import (
@@ -22,6 +21,16 @@
 from cinder_contexts import VNXSubordinateContext
 from charmhelpers.payload.execd import execd_preinstall
 
+PACKAGES = [
+    'cinder-api',
+    'cinder-backup',
+    'cinder-common',
+    'cinder-scheduler',
+    'cinder-volume',
+    'navicli',
+    'python-cinder',
+]
+
 hooks = Hooks()
 
 def juju_log(msg):
@@ -51,22 +60,60 @@
     except KeyError:
         return None
 
+def valid_source(source):
+    try:
+        return \
+        (source.startswith('https') or \
+        source.startswith('http') or \
+        source.startswith('ppa'))
+    except Exception:
+        juju_log('invalid source: %s' % source)
+        return False
+
+def valid_key(key):
+    try:
+        return (len(key) >= 8)
+    except Exception:
+        juju_log('invalid key (len < 8): %s' % key)
+        return False
+
+
 @hooks.hook('storage-backend-relation-joined',
             'storage-backend-relation-changed')
 def storage_backend(rel_id=None):
-    add_source(config_get('vnx_source'), config_get('vnx_source_key'))
-    add_source(config_get('navicli_source'), config_get('navicli_source_key'))
+    # REQUIRED: add vnx source and key
+    vnx_source = config_get('vnx_source')
+    vnx_key = config_get('vnx_source_key')
+    juju_log('storage_backend: vnx_source=%s vnx_key=%s' % (vnx_source, vnx_key))
+    if not valid_source(vnx_source) or not valid_key(vnx_key):
+        raise     
+    add_source(vnx_source, vnx_key)
+
+    # REQUIRED: add navicli source and key
+    navicli_source = config_get('navicli_source')
+    navicli_key = config_get('navicli_source_key')
+    juju_log('storage_backend: navicli_source=%s navicli_key=%s' % (navicli_source,
+                                                               navicli_key))
+    if not valid_source(navicli_source) or not valid_key(navicli_key):
+        raise
+    add_source(navicli_source, navicli_key)
+
+    # update and install packages
     apt_update()
-    apt_install("navicli")
+    dpkg_opts = [
+        '--option', 'Dpkg::Options::=--force-confnew',
+        '--option', 'Dpkg::Options::=--force-confdef',
+    ]
+    apt_install(packages=PACKAGES, options=dpkg_opts, fatal=True)
     relation_set(
         relation_id=rel_id,
         backend_name=service_name(),
         subordinate_configuration=json.dumps(VNXSubordinateContext()())
     )
-    apt_upgrade(options=None, fatal=True, dist=True)
+
 
 if __name__ == '__main__':
     try:
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
-        log('Unknown hook {} - skipping.'.format(e))
+        juju_log('Unknown hook {} - skipping.'.format(e))