Merge lp:~bac/charms/trusty/openstack-dashboard/dashboard-plugin into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Brad Crittenden]

This branch adds a new relation 'dashboard-plugin' for openstack-dashboard to communicate to subordinate plugin charms details about the installation so the plugin can insert itself.

Currently the two pieces of information sent via the relationship are bin_path and openstack_dir.

The bin_path can be different based on how openstack is installed by the charm. If installed via distro or cloud-archive, a debian package is used to install openstack and the system python libraries are modified. If installed via git source then a virtual environment is used. If a subordinate charm needs to install python packages via pip then it needs to know which pip to use. bin_path specifies the correct environment to use, either /usr/bin or the result of git_pip_venv_dir.

openstack_dir provides the path to where openstack is installed. Currently it is always /usr/share/openstack_dashboard. From that information the subordinate can figure out the path to local/enabled for adding dashboard enabling slugs (e.g. _50_mydashboard.py).

[lp:~bac/charms/trusty/openstack-dashboard/dashboard-plugin]

83. By James Page on 2015-09-04

[trivial] Resync helpers to pickup liberty version detection

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

charm_lint_check #9387 openstack-dashboard-next for bac mp270177
    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/12273326/
Build: http://10.245.162.77:8080/job/charm_lint_check/9387/

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

charm_unit_test #8682 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #9389 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9389/

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

charm_unit_test #8684 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6251 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #6253 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

[lp:~bac/charms/trusty/openstack-dashboard/dashboard-plugin]

84. By James Page on 2015-09-09

[1chb1n,r=james-page]

Update tests for T-K, V-K, prep for T-L and W-L. Clean up old lint. Resolve bug 1474030 race in svc restart checks.

85. By Brad Crittenden on 2015-09-10

Add dashboard-plugin relation

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

charm_lint_check #10965 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10965/

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

charm_amulet_test #6858 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12606204/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6858/

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

charm_unit_test #10235 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #11025 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11025/

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

charm_amulet_test #6874 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12612946/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6874/

[Liam Young (gnuoy)]

See inline comment

review: Needs Fixing

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

charm_lint_check #11091 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11091/

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

charm_unit_test #10299 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6897 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12625976/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6897/

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

charm_lint_check #11097 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11097/

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

charm_unit_test #10305 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6907 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12627583/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6907/

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

charm_lint_check #11150 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11150/

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

charm_unit_test #10355 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_unit_test #10357 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #11155 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11155/

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

charm_amulet_test #6927 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #6932 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #7030 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12645015/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7030/

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

charm_lint_check #11329 openstack-dashboard-next for bac mp270177
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11329/

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

charm_unit_test #10523 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #7115 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

[Brad Crittenden (bac)]

Liam I have made the change you requested and now have all tests passing since the problem with CI was resolved. Please take another look and let me know how we can get this merged.

[Liam Young (gnuoy)]

approve

review: Approve

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-09-24 16:32:05 +0000
+++ hooks/horizon_hooks.py	2015-10-05 18:31:20 +0000
@@ -24,6 +24,7 @@
     config_value_changed,
     configure_installation_source,
     git_install_requested,
+    git_pip_venv_dir,
     openstack_upgrade_available,
     os_release,
     save_script_rc
@@ -38,7 +39,8 @@
     do_openstack_upgrade,
     git_install,
     git_post_install_late,
-    setup_ipv6
+    setup_ipv6,
+    INSTALL_DIR
 )
 from charmhelpers.contrib.network.ip import (
     get_iface_for_address,
@@ -245,8 +247,15 @@
 
 
 @hooks.hook('dashboard-plugin-relation-joined')
-def plugin_relation_joined():
-    relation_set(release=os_release("openstack-dashboard"))
+def plugin_relation_joined(rel_id=None):
+    if git_install_requested():
+        bin_path = git_pip_venv_dir(config('openstack-origin-git'))
+    else:
+        bin_path = '/usr/bin'
+    relation_set(release=os_release("openstack-dashboard"),
+                 relation_id=rel_id,
+                 bin_path=bin_path,
+                 openstack_dir=INSTALL_DIR)
 
 
 @hooks.hook('dashboard-plugin-relation-changed')
 
=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2015-09-24 16:31:59 +0000
+++ hooks/horizon_utils.py	2015-10-05 18:31:20 +0000
@@ -91,6 +91,7 @@
 APACHE_24_DEFAULT = "%s/sites-available/000-default.conf" % (APACHE_CONF_DIR)
 APACHE_SSL = "%s/sites-available/default-ssl" % (APACHE_CONF_DIR)
 APACHE_DEFAULT = "%s/sites-available/default" % (APACHE_CONF_DIR)
+INSTALL_DIR = "/usr/share/openstack-dashboard"
 ROUTER_SETTING = \
     "/usr/share/openstack-dashboard/openstack_dashboard/enabled/_40_router.py"
 
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-09-12 10:58:20 +0000
+++ metadata.yaml	2015-10-05 18:31:20 +0000
@@ -13,15 +13,15 @@
     scope: container
   website:
     interface: http
+  dashboard-plugin:
+    interface: dashboard-plugin
+    scope: container
 requires:
   identity-service:
     interface: keystone
   ha:
     interface: hacluster
     scope: container
-  dashboard-plugin:
-    interface: dashboard-plugin
-    scope: container
 peers:
   cluster:
     interface: openstack-dashboard-ha
 
=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2015-08-27 15:02:34 +0000
+++ unit_tests/test_horizon_hooks.py	2015-10-05 18:31:20 +0000
@@ -308,6 +308,37 @@
         self._call_hook('website-relation-joined')
         self.relation_set.assert_called_with(port=70, hostname='192.168.1.1')
 
+    @patch.object(hooks, 'os_release')
+    @patch.object(hooks, 'git_install_requested')
+    def test_dashboard_config_joined_not_git(
+            self, _git_requested, _os_release):
+        _git_requested.return_value = False
+        _os_release.return_value = 'vivid'
+        self._call_hook('dashboard-plugin-relation-joined')
+        self.relation_set.assert_called_with(
+            release='vivid',
+            bin_path='/usr/bin',
+            openstack_dir='/usr/share/openstack-dashboard',
+            relation_id=None
+        )
+
+    @patch.object(hooks, 'os_release')
+    @patch.object(hooks, 'git_pip_venv_dir')
+    @patch.object(hooks, 'git_install_requested')
+    def test_dashboard_config_joined_git(
+            self, _git_requested, _git_pip_venv_dir, _os_release):
+        expected_bin_path = '/mnt/fuji/venv'
+        _git_requested.return_value = True
+        _git_pip_venv_dir.return_value = expected_bin_path
+        _os_release.return_value = 'wily'
+        self._call_hook('dashboard-plugin-relation-joined')
+        self.relation_set.assert_called_with(
+            release='wily',
+            bin_path=expected_bin_path,
+            openstack_dir='/usr/share/openstack-dashboard',
+            relation_id=None
+        )
+
     @patch('sys.argv')
     @patch.object(hooks, 'install')
     def test_main_hook_exists(self, _install, _argv):