Merge lp:~xfactor973/charms/trusty/ceph/dashboard-wip into lp:~openstack-charmers-archive/charms/trusty/ceph/trunk

[Chris Holcombe]

This change is what was needed to get the Ceph dashboard working. I also fixed a small bug where the subprocess output wasn't being checked and failed the dashboard-relation-joined hook.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9246 ceph for xfactor973 mp269974
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12256785/
Build: http://10.245.162.77:8080/job/charm_lint_check/9246/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8547 ceph for xfactor973 mp269974
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8547/

[Chris Holcombe (xfactor973)]

Those lint failures aren't something I changed.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6237 ceph for xfactor973 mp269974
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6237/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12343 ceph for xfactor973 mp269974
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12895619/
Build: http://10.245.162.77:8080/job/charm_lint_check/12343/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11452 ceph for xfactor973 mp269974
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11452/

Unmerged revisions

111. By Chris Holcombe on 2015-09-02

Patch to get the ceph dashboard operational

110. By Chris Holcombe on 2015-08-27

WIP

=== modified file '.bzrignore'
--- .bzrignore	2014-10-01 20:08:33 +0000
+++ .bzrignore	2015-09-02 20:10:00 +0000
@@ -1,2 +1,3 @@
 bin
 .coverage
+.idea

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2015-03-23 17:59:39 +0000
+++ hooks/ceph.py	2015-09-02 20:10:00 +0000
@@ -1,4 +1,3 @@
-
 #
 # Copyright 2012 Canonical Ltd.
 #
@@ -105,6 +104,7 @@
         # Ignore any errors for this call
         subprocess.call(cmd)
 
+
 DISK_FORMATS = [
     'xfs',
     'ext4',
@@ -118,7 +118,7 @@
         info = info.split("\n")  # IGNORE:E1103
         for line in info:
             if line.startswith(
-                'Partition GUID code: 4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D'
+                    'Partition GUID code: 4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D'
             ):
                 return True
     except subprocess.CalledProcessError:
@@ -232,6 +232,15 @@
     'osd': ['allow rwx']
 }
 
+_dashboard_caps = {
+    'mon': ['allow rwx'],
+    'osd': ['allow rwx']
+}
+
+
+def get_dashboard_key():
+    return get_named_key('dashboard', _dashboard_caps)
+
 
 def get_radosgw_key():
     return get_named_key('radosgw.gateway', _radosgw_caps)
@@ -260,7 +269,12 @@
             subsystem,
             '; '.join(subcaps),
         ])
-    return parse_key(subprocess.check_output(cmd).strip())  # IGNORE:E1103
+    try:
+        output = subprocess.check_output(cmd)
+        return parse_key(output.strip())  # IGNORE:E1103
+    except subprocess.CalledProcessError as e:
+        log("get_named_key failed with output: " + str(e.output))
+        raise
 
 
 def upgrade_key_caps(key, caps):

=== added symlink 'hooks/dashboard-relation-joined'
=== target is u'hooks.py'
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-03-23 17:40:42 +0000
+++ hooks/hooks.py	2015-09-02 20:10:00 +0000
@@ -112,6 +112,7 @@
     install_alternative('ceph.conf', '/etc/ceph/ceph.conf',
                         charm_ceph_conf, 100)
 
+
 JOURNAL_ZAPPED = '/var/lib/ceph/journal_zapped'
 
 
@@ -145,7 +146,7 @@
 
     osd_journal = config('osd-journal')
     if (osd_journal and not os.path.exists(JOURNAL_ZAPPED)
-            and os.path.exists(osd_journal)):
+        and os.path.exists(osd_journal)):
         ceph.zap_disk(osd_journal)
         with open(JOURNAL_ZAPPED, 'w') as zapped:
             zapped.write('DONE')
@@ -200,7 +201,7 @@
     for relid in relation_ids('mon'):
         relation_set(relation_id=relid,
                      relation_settings={'ceph-public-address':
-                                        get_public_addr()})
+                                            get_public_addr()})
 
 
 @hooks.hook('mon-relation-departed',
@@ -268,6 +269,22 @@
         log('mon cluster not in quorum - deferring fsid provision')
 
 
[e-mail]('dashboard-relation-joined')
+def dashboard_relation(relid=None):
+    if ceph.is_quorum():
+        log("Providing dashboard with keys")
+        data = {
+            'fsid': config('fsid'),
+            'dashboard_key': ceph.get_dashboard_key(),
+            'auth': config('auth-supported'),
+            'mon_hosts': ", ".join(get_mon_hosts()),
+        }
+        relation_set(relation_id=relid,
+                     relation_settings=data)
+    else:
+        log('mon cluster not in quorum - deferring key provision')
+
+
 @hooks.hook('radosgw-relation-joined')
 def radosgw_relation(relid=None):
     # Install radosgw for admin tools

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-08-10 16:32:52 +0000
+++ metadata.yaml	2015-09-02 20:10:00 +0000
@@ -22,6 +22,8 @@
     interface: ceph-osd
   radosgw:
     interface: ceph-radosgw
+  dashboard:
+    interface: dashboard
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container