Moved import-dashboard to use utils library for retrieving passwords

1 files changed, 7 insertions, 12 deletions

diff --git a/actions/import-dashboard b/actions/import-dashboard
index 2f0854f..fe58b73 100755
--- a/actions/import-dashboard
+++ b/actions/import-dashboard
@@ -5,28 +5,23 @@ import requests
 import json
 import base64
 import traceback
+import sys
 from charmhelpers.core.hookenv import (
 action_fail,
 action_set,
 action_get,
- config,
 log,
 )
 
-from charmhelpers.core import unitdata
+from grafana_utils import get_admin_password
 
 action = "import-dashboard"
 
-kv = unitdata.kv()
-if kv.get('grafana.admin_password'):
- # print('Admin password: {}'.format(kv.get('grafana.admin_password')))
- passwd = kv.get('grafana.admin_password')
-elif config('admin_password'):
- passwd = config('admin_password')
- # print('Admin password: {}'.format(config('admin_password')))
-else:
- action_fail('ERROR! Unable to retrieve password.')
- exit(0)
+passwd = get_admin_password()
+
+if passwd is None:
+ action_fail('Unable to retrieve password.')
+ sys.exit(0)
 
 grafana = "http://localhost:3000"
 api_auth = ('admin', passwd)