Merge lp:~moon127/charms/precise/daisy/schema-connect-cassandra into lp:~daisy-pluckers/charms/precise/daisy/trunk

[Gareth Woolridge]

The call to oops-respository's schema.py fails unless we also pass the cassandra username and password.

This fix allowed me to rerun a failing upgrade-charm hook and get a fresh DSE casssandra env for staging redeploy to initialise.

Note the daisy charm leaks credentials quite extensively - while this change makes that no worse - it would be a good practise to work to eradicate secrets from the juju logs.

[Brian Murray (brian-murray)]

This looks good, thanks!

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2016-07-29 18:07:47 +0000
+++ hooks/config-changed	2016-08-01 15:54:36 +0000
@@ -38,7 +38,7 @@
 # Setup the database schema
 for host in $($(dirname $0)/print-cassandra-hosts $LOCAL_CONFIG_PATH); do
     if PYTHONPATH=$LOCAL_CONFIG_LOCATION "$(dirname $0)/create-keyspace" -u "$cassandra_username" -p "$cassandra_password" "$host"; then
-        OOPS_KEYSPACE=crashdb OOPS_HOST="$host" python \
+        OOPS_KEYSPACE=crashdb OOPS_HOST="$host" OOPS_USERNAME="$cassandra_username" OOPS_PASSWORD="$cassandra_password" python \
             /usr/share/pyshared/oopsrepository/schema.py
     fi
 done